From be8c28da9a7a980851f68fe6e1c36c8ebf4182ef Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 22 Jul 2018 19:54:17 -0400 Subject: [PATCH 01/22] Revert "TEMP Fixes #954 [download.nextcloud.com's SSL/TLS cert expired 2018-07-22 preventing MEDIUM+BIG IIAB installs]" --- roles/nextcloud/tasks/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml index 136bfea1a..3252efa43 100644 --- a/roles/nextcloud/tasks/main.yml +++ b/roles/nextcloud/tasks/main.yml @@ -18,7 +18,6 @@ url: "{{ nextcloud_dl_url }}/{{ nextcloud_orig_src_file }}" dest: "{{ downloads_dir }}/{{ nextcloud_src_file }}" force: yes - validate_certs: False # TEMPORARY ON/AFTER 2018-07-22 AS download.nextcloud.com CERT EXPIRED: https://github.com/iiab/iiab/issues/954 timeout: "{{ download_timeout }}" when: internet_available and nextcloud_force_install async: 900 From 8ba83149dc4ee1cf0a4b7eeb3a6b71e18294dc1a Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 22 Jul 2018 19:56:18 -0400 Subject: [PATCH 02/22] Update main.yml --- roles/nextcloud/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml index 3252efa43..05ebee138 100644 --- a/roles/nextcloud/tasks/main.yml +++ b/roles/nextcloud/tasks/main.yml @@ -18,6 +18,7 @@ url: "{{ nextcloud_dl_url }}/{{ nextcloud_orig_src_file }}" dest: "{{ downloads_dir }}/{{ nextcloud_src_file }}" force: yes + #validate_certs: False # TEMPORARY ON/AFTER 2018-07-22 AS download.nextcloud.com CERT EXPIRED: https://github.com/iiab/iiab/issues/954 timeout: "{{ download_timeout }}" when: internet_available and nextcloud_force_install async: 900 From 4ddc7c4461f00a7c1dd0a3170f71b306cae264f8 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 23 Jul 2018 09:44:17 -0400 Subject: [PATCH 03/22] Update mongodb.service.j2 --- roles/mongodb/templates/mongodb.service.j2 | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/roles/mongodb/templates/mongodb.service.j2 b/roles/mongodb/templates/mongodb.service.j2 index 4407efddc..1ae050ae8 100644 --- a/roles/mongodb/templates/mongodb.service.j2 +++ b/roles/mongodb/templates/mongodb.service.j2 @@ -1,14 +1,20 @@ [Unit] Description=High-performance, schema-free document-oriented database After=syslog.target network.target - + [Service] Type=simple User=mongodb Group=mongodb -ExecStartPre=/usr/bin/mongod --repair --dbpath {{ mongodb_db_path }} +# FAILS (after power failures, etc) as --repair cannot run when lock file exists: (https://github.com/iiab/iiab/issues/942) +#ExecStartPre=/usr/bin/mongod --repair --dbpath /library/dbdata/mongodb +# FAILS as systemd cannot run bash here: +#ExecStartPre=if [ ! -f /library/dbdata/mongodb/mongod.lock ]; then /usr/bin/mongod --repair --dbpath {{ mongodb_db_path }}; fi +ExecStartPre=/usr/bin/iiab-mongodb-repair-if-no-lock ExecStart=/usr/bin/mongod -f {{ mongodb_conf }} ExecStop=/usr/bin/killall mongod - +# killall's SIGTERM (15) seems fine, to induce a graceful stop. This would work too: +#ExecStop=mongod --dbpath {{ mongodb_db_path }} --shutdown + [Install] WantedBy=multi-user.target From 3ab57666c20aefe4e90d86ee38c7684977025a45 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 23 Jul 2018 09:51:11 -0400 Subject: [PATCH 04/22] Update main.yml --- roles/mongodb/defaults/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/mongodb/defaults/main.yml b/roles/mongodb/defaults/main.yml index 6aed9834a..61d1d951f 100644 --- a/roles/mongodb/defaults/main.yml +++ b/roles/mongodb/defaults/main.yml @@ -1,5 +1,6 @@ mongodb_install: False mongodb_enabled: False -mongodb_db_path: "{{ content_base }}/dbdata/mongodb" # == /library/dbdata/mongodb/ mongodb_conf: /etc/mongod.conf +mongodb_db_path: "{{ content_base }}/dbdata/mongodb" # == /library/dbdata/mongodb/ +mongodb_db_lock_file: "{{ mongodb_db_path }}/mongod.lock" From 08992f47be472cd3b95149f4cc8aa0e5cfc9b10f Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 23 Jul 2018 09:52:26 -0400 Subject: [PATCH 05/22] Create iiab-mongodb-repair-if-no-lock.j2 --- roles/mongodb/templates/iiab-mongodb-repair-if-no-lock.j2 | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 roles/mongodb/templates/iiab-mongodb-repair-if-no-lock.j2 diff --git a/roles/mongodb/templates/iiab-mongodb-repair-if-no-lock.j2 b/roles/mongodb/templates/iiab-mongodb-repair-if-no-lock.j2 new file mode 100644 index 000000000..4cde26331 --- /dev/null +++ b/roles/mongodb/templates/iiab-mongodb-repair-if-no-lock.j2 @@ -0,0 +1,7 @@ +#!/bin/bash + +if [ ! -f {{ mongodb_db_lock_file }} ]; then + /usr/bin/mongod --repair --dbpath {{ mongodb_db_path }} +else + echo '"mongod --repair" cannot run when {{ mongodb_db_lock_file }} present.' +fi From b08e12fba3fd14e7329353e3471d94ca6583ec36 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 23 Jul 2018 09:57:45 -0400 Subject: [PATCH 06/22] Update iiab-mongodb-repair-if-no-lock.j2 --- roles/mongodb/templates/iiab-mongodb-repair-if-no-lock.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mongodb/templates/iiab-mongodb-repair-if-no-lock.j2 b/roles/mongodb/templates/iiab-mongodb-repair-if-no-lock.j2 index 4cde26331..f10b05c30 100644 --- a/roles/mongodb/templates/iiab-mongodb-repair-if-no-lock.j2 +++ b/roles/mongodb/templates/iiab-mongodb-repair-if-no-lock.j2 @@ -3,5 +3,5 @@ if [ ! -f {{ mongodb_db_lock_file }} ]; then /usr/bin/mongod --repair --dbpath {{ mongodb_db_path }} else - echo '"mongod --repair" cannot run when {{ mongodb_db_lock_file }} present.' + echo '"mongod --repair" cannot run when {{ mongodb_db_lock_file }} present.' >&2 # Output to STDERR but keep going, so /etc/systems/system/mongodb.service continues fi From 5c55e16b06f2965c0af670618ffe46171cc0d01e Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 23 Jul 2018 10:01:21 -0400 Subject: [PATCH 07/22] Update main.yml --- roles/mongodb/tasks/main.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/roles/mongodb/tasks/main.yml b/roles/mongodb/tasks/main.yml index c4c5cafde..e52e10360 100644 --- a/roles/mongodb/tasks/main.yml +++ b/roles/mongodb/tasks/main.yml @@ -25,10 +25,11 @@ dest: "{{ item.dest }}" owner: root group: root - mode: 0644 + mode: "{{ item.mode }}" with_items: - - { src: 'mongod.conf.j2', dest: "{{ mongodb_conf }}" } - - { src: 'mongodb.service.j2', dest: '/etc/systemd/system/mongodb.service' } + - { src: 'mongod.conf.j2', dest: "{{ mongodb_conf }}", mode: '0644' } + - { src: 'mongodb.service.j2', dest: '/etc/systemd/system/mongodb.service', mode: '0644' } + - { src: 'iiab-mongodb-repair-if-no-lock.j2', dest: '/usr/bin/iiab-mongodb-repair-if-no-lock', mode: '0755' } - name: Enable+restart systemd service if mongodb_enabled, with "systemctl daemon-reload" (in case mongodb.service changed?) systemd: From 37591a612ccf6bf6e585828c2d519339fb932a44 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 23 Jul 2018 10:07:04 -0400 Subject: [PATCH 08/22] Update iiab-mongodb-repair-if-no-lock.j2 --- roles/mongodb/templates/iiab-mongodb-repair-if-no-lock.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/mongodb/templates/iiab-mongodb-repair-if-no-lock.j2 b/roles/mongodb/templates/iiab-mongodb-repair-if-no-lock.j2 index f10b05c30..790748103 100644 --- a/roles/mongodb/templates/iiab-mongodb-repair-if-no-lock.j2 +++ b/roles/mongodb/templates/iiab-mongodb-repair-if-no-lock.j2 @@ -1,7 +1,7 @@ #!/bin/bash -if [ ! -f {{ mongodb_db_lock_file }} ]; then - /usr/bin/mongod --repair --dbpath {{ mongodb_db_path }} -else +if [ -f {{ mongodb_db_lock_file }} ]; then echo '"mongod --repair" cannot run when {{ mongodb_db_lock_file }} present.' >&2 # Output to STDERR but keep going, so /etc/systems/system/mongodb.service continues +else + /usr/bin/mongod --repair --dbpath {{ mongodb_db_path }} fi From 8dadcd0483b29326c357ed204f741876f40e75a8 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 23 Jul 2018 10:41:03 -0400 Subject: [PATCH 09/22] Update local_vars_min.yml --- vars/local_vars_min.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index c8ce902db..8f5ee2ba1 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -190,11 +190,9 @@ pathagar_install: False pathagar_enabled: False # Might stall MongoDB on Power Failure: github.com/xsce/xsce/issues/879 +# Sugarizer 1.0.1+ strategies to solve? github.com/iiab/iiab/pull/957 sugarizer_install: False sugarizer_enabled: False -# sugarizer_enabled is currently IGNORED as basic Sugarizer works w/o Journal! -# https://github.com/iiab/iiab/issues/193 Subsequent "./runrole sugarizer" fail -# https://github.com/iiab/iiab/issues/240 Sugarizer 0.8 to 0.9 ongoing issues # 8-MGMT-TOOLS From 6661c839dd1c32b65a65ce452afe6c663e207486 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 23 Jul 2018 10:41:51 -0400 Subject: [PATCH 10/22] Update local_vars_min_vpn.yml --- vars/local_vars_min_vpn.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/vars/local_vars_min_vpn.yml b/vars/local_vars_min_vpn.yml index 31725c58f..015bc0ee0 100644 --- a/vars/local_vars_min_vpn.yml +++ b/vars/local_vars_min_vpn.yml @@ -190,11 +190,9 @@ pathagar_install: False pathagar_enabled: False # Might stall MongoDB on Power Failure: github.com/xsce/xsce/issues/879 +# Sugarizer 1.0.1+ strategies to solve? github.com/iiab/iiab/pull/957 sugarizer_install: False sugarizer_enabled: False -# sugarizer_enabled is currently IGNORED as basic Sugarizer works w/o Journal! -# https://github.com/iiab/iiab/issues/193 Subsequent "./runrole sugarizer" fail -# https://github.com/iiab/iiab/issues/240 Sugarizer 0.8 to 0.9 ongoing issues # 8-MGMT-TOOLS From 1b56268fcc9aed3767a5a91a33a906c3f455895c Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 23 Jul 2018 10:42:19 -0400 Subject: [PATCH 11/22] Update local_vars_medium.yml --- vars/local_vars_medium.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index b6be18fed..fd109e255 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -190,11 +190,9 @@ pathagar_install: False pathagar_enabled: False # Might stall MongoDB on Power Failure: github.com/xsce/xsce/issues/879 +# Sugarizer 1.0.1+ strategies to solve? github.com/iiab/iiab/pull/957 sugarizer_install: True sugarizer_enabled: True -# sugarizer_enabled is currently IGNORED as basic Sugarizer works w/o Journal! -# https://github.com/iiab/iiab/issues/193 Subsequent "./runrole sugarizer" fail -# https://github.com/iiab/iiab/issues/240 Sugarizer 0.8 to 0.9 ongoing issues # 8-MGMT-TOOLS From a131a8b540472633311351d2874a20638c3d3205 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 23 Jul 2018 10:42:42 -0400 Subject: [PATCH 12/22] Update local_vars_medium_vpn.yml --- vars/local_vars_medium_vpn.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/vars/local_vars_medium_vpn.yml b/vars/local_vars_medium_vpn.yml index 11d2af017..b82c44260 100644 --- a/vars/local_vars_medium_vpn.yml +++ b/vars/local_vars_medium_vpn.yml @@ -190,11 +190,9 @@ pathagar_install: False pathagar_enabled: False # Might stall MongoDB on Power Failure: github.com/xsce/xsce/issues/879 +# Sugarizer 1.0.1+ strategies to solve? github.com/iiab/iiab/pull/957 sugarizer_install: True sugarizer_enabled: True -# sugarizer_enabled is currently IGNORED as basic Sugarizer works w/o Journal! -# https://github.com/iiab/iiab/issues/193 Subsequent "./runrole sugarizer" fail -# https://github.com/iiab/iiab/issues/240 Sugarizer 0.8 to 0.9 ongoing issues # 8-MGMT-TOOLS From be28c217c9db7f8db899a54b0457fedc6abd046b Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 23 Jul 2018 10:43:07 -0400 Subject: [PATCH 13/22] Update local_vars_big.yml --- vars/local_vars_big.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index 56a81d9e8..7e693f6c3 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -190,11 +190,9 @@ pathagar_install: False pathagar_enabled: False # Might stall MongoDB on Power Failure: github.com/xsce/xsce/issues/879 +# Sugarizer 1.0.1+ strategies to solve? github.com/iiab/iiab/pull/957 sugarizer_install: True sugarizer_enabled: True -# sugarizer_enabled is currently IGNORED as basic Sugarizer works w/o Journal! -# https://github.com/iiab/iiab/issues/193 Subsequent "./runrole sugarizer" fail -# https://github.com/iiab/iiab/issues/240 Sugarizer 0.8 to 0.9 ongoing issues # 8-MGMT-TOOLS From cb0eac169d469e3cabf6bbe43e73a54d47269e42 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 23 Jul 2018 10:43:31 -0400 Subject: [PATCH 14/22] Update local_vars_big_vpn.yml --- vars/local_vars_big_vpn.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/vars/local_vars_big_vpn.yml b/vars/local_vars_big_vpn.yml index 6911b7c38..33e5aa6e8 100644 --- a/vars/local_vars_big_vpn.yml +++ b/vars/local_vars_big_vpn.yml @@ -190,11 +190,9 @@ pathagar_install: False pathagar_enabled: False # Might stall MongoDB on Power Failure: github.com/xsce/xsce/issues/879 +# Sugarizer 1.0.1+ strategies to solve? github.com/iiab/iiab/pull/957 sugarizer_install: True sugarizer_enabled: True -# sugarizer_enabled is currently IGNORED as basic Sugarizer works w/o Journal! -# https://github.com/iiab/iiab/issues/193 Subsequent "./runrole sugarizer" fail -# https://github.com/iiab/iiab/issues/240 Sugarizer 0.8 to 0.9 ongoing issues # 8-MGMT-TOOLS From 373ca4066d5cdedcefe94d02aecdee5a3c161259 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 23 Jul 2018 10:45:29 -0400 Subject: [PATCH 15/22] Update default_vars.yml --- vars/default_vars.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 015e9ce46..8f097e95a 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -342,6 +342,8 @@ pathagar_install: False pathagar_enabled: False # Sugarizer +# Might stall MongoDB on Power Failure: github.com/xsce/xsce/issues/879 +# Sugarizer 1.0.1+ strategies to solve? github.com/iiab/iiab/pull/957 sugarizer_install: True sugarizer_enabled: False sugarizer_port: 8089 From bb1c0448e7eca506cc1171aa47723cb95d2a9979 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 23 Jul 2018 17:49:34 -0400 Subject: [PATCH 16/22] 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 17/22] 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 18/22] 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 19/22] 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 20/22] 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 21/22] 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 22/22] 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