From bb1c0448e7eca506cc1171aa47723cb95d2a9979 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 23 Jul 2018 17:49:34 -0400 Subject: [PATCH 1/7] Update iiab-install --- iiab-install | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/iiab-install b/iiab-install index d3dcb4df9..a303d63f0 100755 --- a/iiab-install +++ b/iiab-install @@ -12,10 +12,28 @@ OS=${OS//\"/} MIN_RPI_KERN=4.9.59-v7+ MIN_ANSIBLE_VER=2.5.6 -export ANSIBLE_LOG_PATH="$CWD/iiab-install.log" - echo -e "\n\n./iiab-install $* BEGUN IN $CWD\n" +if [ ! -f /etc/iiab/local_vars.yml ]; then + echo -e "EXITING: /opt/iiab/iiab/iiab-install REQUIRES /etc/iiab/local_vars.yml\n" >&2 + echo -e "(1) Please read http://wiki.iiab.io/local_vars.yml to learn more." >&2 + echo -e "(2) MIN/MEDIUM/BIG samples are included in /opt/iiab/iiab/vars" >&2 + echo -e "(3) NEED 4 SPEED? RUN INTERNET-IN-A-BOX'S FRIENDLY 1-LINE INSTALLER:\n" >&2 + echo -e " http://download.iiab.io\n" >&2 + #case $OS in + # OLPC | fedora) + # echo -e "Please examine /opt/iiab/iiab/vars/local_vars_olpc.yml for XO laptops.\n" >&2 + # ;; + # centos | debian | ubuntu | raspbian) + # echo -e "Please consider /opt/iiab/iiab/vars/local_vars_medium.yml or similar.\n" >&2 + # ;; + # *) + # echo -e "EXITING: IIAB requires Raspbian, Debian, Ubuntu, CentOS or OLPC/Fedora.\n" >&2 + # ;; + #esac + exit 1 +fi + if [ ! -f /etc/ansible/facts.d/local_facts.fact ]; then mkdir -p /etc/ansible/facts.d fi @@ -120,28 +138,11 @@ if [ "$STAGE" -lt 2 ] && [ "$1" == "--debug" ]; then echo -e "\n'--debug' *ignored* as STAGE (counter) < 2." fi -# If /etc/iiab/local_vars.yml is missing, put a default file in place. -if [ ! -f /etc/iiab/local_vars.yml ]; then - case $OS in - OLPC | fedora) - cp ./vars/local_vars_olpc.yml /etc/iiab/local_vars.yml - echo -e "\n/etc/iiab/local_vars.yml created from /opt/iiab/iiab/vars/local_vars_olpc.yml defaults." - ;; - centos | debian | ubuntu | raspbian) - cp ./vars/local_vars_medium.yml /etc/iiab/local_vars.yml - echo -e "\n/etc/iiab/local_vars.yml created from /opt/iiab/iiab/vars/local_vars_medium.yml defaults." - echo "See MIN/MEDIUM/BIG options @ http://wiki.iiab.io/local_vars.yml" - ;; - *) - echo -e "\nEXITING: IIAB requires Raspbian, Debian, Ubuntu, CentOS or OLPC/Fedora." - exit 1 - ;; - esac -fi - echo -e "\nTRY TO RERUN './iiab-install' IF IT FAILS DUE TO CONNECTIVITY ISSUES ETC!" echo -e "\nRunning local playbooks....Stage 0 will now run....followed by Stages $(($STAGE + 1))-9" +export ANSIBLE_LOG_PATH="$CWD/iiab-install.log" + ansible -m setup -i $INVENTORY localhost --connection=local >> /dev/null ansible-playbook -i $INVENTORY $PLAYBOOK ${ARGS} --connection=local From dff125753642005a7dca19c74929c0fcada6e3f6 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 23 Jul 2018 17:51:55 -0400 Subject: [PATCH 2/7] Update iiab-install --- iiab-install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/iiab-install b/iiab-install index a303d63f0..b12c9609f 100755 --- a/iiab-install +++ b/iiab-install @@ -12,10 +12,8 @@ OS=${OS//\"/} MIN_RPI_KERN=4.9.59-v7+ MIN_ANSIBLE_VER=2.5.6 -echo -e "\n\n./iiab-install $* BEGUN IN $CWD\n" - if [ ! -f /etc/iiab/local_vars.yml ]; then - echo -e "EXITING: /opt/iiab/iiab/iiab-install REQUIRES /etc/iiab/local_vars.yml\n" >&2 + echo -e "\n\nEXITING: /opt/iiab/iiab/iiab-install REQUIRES /etc/iiab/local_vars.yml\n" >&2 echo -e "(1) Please read http://wiki.iiab.io/local_vars.yml to learn more." >&2 echo -e "(2) MIN/MEDIUM/BIG samples are included in /opt/iiab/iiab/vars" >&2 echo -e "(3) NEED 4 SPEED? RUN INTERNET-IN-A-BOX'S FRIENDLY 1-LINE INSTALLER:\n" >&2 @@ -34,6 +32,8 @@ if [ ! -f /etc/iiab/local_vars.yml ]; then exit 1 fi +echo -e "\n\n./iiab-install $* BEGUN IN $CWD\n" + if [ ! -f /etc/ansible/facts.d/local_facts.fact ]; then mkdir -p /etc/ansible/facts.d fi From cc1beb6d72366114b1071d701f797afb2da6f384 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 23 Jul 2018 17:59:17 -0400 Subject: [PATCH 3/7] Update iiab-install --- iiab-install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/iiab-install b/iiab-install index b12c9609f..66c7b8cdb 100755 --- a/iiab-install +++ b/iiab-install @@ -16,8 +16,8 @@ if [ ! -f /etc/iiab/local_vars.yml ]; then echo -e "\n\nEXITING: /opt/iiab/iiab/iiab-install REQUIRES /etc/iiab/local_vars.yml\n" >&2 echo -e "(1) Please read http://wiki.iiab.io/local_vars.yml to learn more." >&2 echo -e "(2) MIN/MEDIUM/BIG samples are included in /opt/iiab/iiab/vars" >&2 - echo -e "(3) NEED 4 SPEED? RUN INTERNET-IN-A-BOX'S FRIENDLY 1-LINE INSTALLER:\n" >&2 - echo -e " http://download.iiab.io\n" >&2 + echo -e "(3) NO TIME FOR DETAILS? RUN INTERNET-IN-A-BOX'S FRIENDLY 1-LINE INSTALLER:\n" >&2 + echo -e " http://download.iiab.io (click on a recent version number!)\n" >&2 #case $OS in # OLPC | fedora) # echo -e "Please examine /opt/iiab/iiab/vars/local_vars_olpc.yml for XO laptops.\n" >&2 From b21cf72d9fa01e11a37901131ee5b60fdc708687 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 23 Jul 2018 18:01:50 -0400 Subject: [PATCH 4/7] Update iiab-install --- iiab-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iiab-install b/iiab-install index 66c7b8cdb..1f22f8689 100755 --- a/iiab-install +++ b/iiab-install @@ -13,7 +13,7 @@ MIN_RPI_KERN=4.9.59-v7+ MIN_ANSIBLE_VER=2.5.6 if [ ! -f /etc/iiab/local_vars.yml ]; then - echo -e "\n\nEXITING: /opt/iiab/iiab/iiab-install REQUIRES /etc/iiab/local_vars.yml\n" >&2 + echo -e "\nEXITING: /opt/iiab/iiab/iiab-install REQUIRES /etc/iiab/local_vars.yml\n" >&2 echo -e "(1) Please read http://wiki.iiab.io/local_vars.yml to learn more." >&2 echo -e "(2) MIN/MEDIUM/BIG samples are included in /opt/iiab/iiab/vars" >&2 echo -e "(3) NO TIME FOR DETAILS? RUN INTERNET-IN-A-BOX'S FRIENDLY 1-LINE INSTALLER:\n" >&2 From 07bd4e590e3f9fb82c9bcc89f7aaf1498729f45f Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 23 Jul 2018 18:04:30 -0400 Subject: [PATCH 5/7] Update iiab-install --- iiab-install | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/iiab-install b/iiab-install index 1f22f8689..633546111 100755 --- a/iiab-install +++ b/iiab-install @@ -13,11 +13,11 @@ MIN_RPI_KERN=4.9.59-v7+ MIN_ANSIBLE_VER=2.5.6 if [ ! -f /etc/iiab/local_vars.yml ]; then - echo -e "\nEXITING: /opt/iiab/iiab/iiab-install REQUIRES /etc/iiab/local_vars.yml\n" >&2 - echo -e "(1) Please read http://wiki.iiab.io/local_vars.yml to learn more." >&2 - echo -e "(2) MIN/MEDIUM/BIG samples are included in /opt/iiab/iiab/vars" >&2 - echo -e "(3) NO TIME FOR DETAILS? RUN INTERNET-IN-A-BOX'S FRIENDLY 1-LINE INSTALLER:\n" >&2 - echo -e " http://download.iiab.io (click on a recent version number!)\n" >&2 + echo -e '\nEXITING: /opt/iiab/iiab/iiab-install REQUIRES /etc/iiab/local_vars.yml\n' >&2 + echo -e '(1) Please read http://wiki.iiab.io/local_vars.yml to learn more.' >&2 + echo -e '(2) MIN/MEDIUM/BIG samples are included in /opt/iiab/iiab/vars' >&2 + echo -e '(3) NO TIME FOR DETAILS? RUN INTERNET-IN-A-BOX'S FRIENDLY 1-LINE INSTALLER:\n' >&2 + echo -e ' http://download.iiab.io (click on "6.6" on a more recent version number!)\n' >&2 #case $OS in # OLPC | fedora) # echo -e "Please examine /opt/iiab/iiab/vars/local_vars_olpc.yml for XO laptops.\n" >&2 From d5fd168c2ca727b044f814d1852142cbdc0375d7 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 23 Jul 2018 18:14:15 -0400 Subject: [PATCH 6/7] Update iiab-install --- iiab-install | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/iiab-install b/iiab-install index 633546111..8eb050b7a 100755 --- a/iiab-install +++ b/iiab-install @@ -13,11 +13,11 @@ MIN_RPI_KERN=4.9.59-v7+ MIN_ANSIBLE_VER=2.5.6 if [ ! -f /etc/iiab/local_vars.yml ]; then - echo -e '\nEXITING: /opt/iiab/iiab/iiab-install REQUIRES /etc/iiab/local_vars.yml\n' >&2 - echo -e '(1) Please read http://wiki.iiab.io/local_vars.yml to learn more.' >&2 - echo -e '(2) MIN/MEDIUM/BIG samples are included in /opt/iiab/iiab/vars' >&2 - echo -e '(3) NO TIME FOR DETAILS? RUN INTERNET-IN-A-BOX'S FRIENDLY 1-LINE INSTALLER:\n' >&2 - echo -e ' http://download.iiab.io (click on "6.6" on a more recent version number!)\n' >&2 + echo -e "\nEXITING: /opt/iiab/iiab/iiab-install REQUIRES /etc/iiab/local_vars.yml\n" >&2 + echo -e "(1) Please read http://wiki.iiab.io/local_vars.yml to learn more." >&2 + echo -e "(2) MIN/MEDIUM/BIG samples are included in /opt/iiab/iiab/vars" >&2 + echo -e "(3) NO TIME FOR DETAILS? RUN INTERNET-IN-A-BOX'S FRIENDLY 1-LINE INSTALLER:\n" >&2 + echo -e ' http://download.iiab.io (click on "6.6" or a more recent version!)\n' >&2 #case $OS in # OLPC | fedora) # echo -e "Please examine /opt/iiab/iiab/vars/local_vars_olpc.yml for XO laptops.\n" >&2 From e0cedc3ee93e203448609e035ede9c86f8d4acdc Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 23 Jul 2018 18:21:08 -0400 Subject: [PATCH 7/7] Update iiab-install --- iiab-install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/iiab-install b/iiab-install index 8eb050b7a..ec6a128c9 100755 --- a/iiab-install +++ b/iiab-install @@ -14,10 +14,10 @@ MIN_ANSIBLE_VER=2.5.6 if [ ! -f /etc/iiab/local_vars.yml ]; then echo -e "\nEXITING: /opt/iiab/iiab/iiab-install REQUIRES /etc/iiab/local_vars.yml\n" >&2 - echo -e "(1) Please read http://wiki.iiab.io/local_vars.yml to learn more." >&2 + echo -e "(1) Please read http://wiki.iiab.io/local_vars.yml to learn more" >&2 echo -e "(2) MIN/MEDIUM/BIG samples are included in /opt/iiab/iiab/vars" >&2 echo -e "(3) NO TIME FOR DETAILS? RUN INTERNET-IN-A-BOX'S FRIENDLY 1-LINE INSTALLER:\n" >&2 - echo -e ' http://download.iiab.io (click on "6.6" or a more recent version!)\n' >&2 + echo -e ' http://download.iiab.io (click on "6.6" or a more recent version!)\n' >&2 #case $OS in # OLPC | fedora) # echo -e "Please examine /opt/iiab/iiab/vars/local_vars_olpc.yml for XO laptops.\n" >&2