From da99df667ae36260b383c79beffaeb2ccbf23009 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 19 Jul 2018 17:20:05 -0400 Subject: [PATCH 01/29] Update iiab-install --- iiab-install | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/iiab-install b/iiab-install index 7cae43b7b..f6d5cd554 100755 --- a/iiab-install +++ b/iiab-install @@ -118,16 +118,16 @@ if [ "$STAGE" -lt 2 ] && [ "$1" == "--debug" ]; then echo -e "\n'--debug' *ignored* as STAGE (counter) < 2." fi -# If vars/local_vars.yml is missing, put a default file in place. -if [ ! -f ./vars/local_vars.yml ]; then +# 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 ./vars/local_vars.yml - echo -e "\nvars/local_vars.yml created from local_vars_olpc.yml defaults." + cp ./vars/local_vars_olpc.yml /etc/iiab/local_vars.yml + echo -e "\n/etc/iiab/local_vars.yml created from local_vars_olpc.yml defaults." ;; centos | debian | ubuntu | raspbian) - cp ./vars/local_vars_medium.yml ./vars/local_vars.yml - echo -e "\nvars/local_vars.yml created from local_vars_medium.yml defaults." + cp ./vars/local_vars_medium.yml /etc/iiab/local_vars.yml + echo -e "\/etc/iiab/local_vars.yml created from local_vars_medium.yml defaults." echo "See MIN/MEDIUM/BIG options @ http://wiki.iiab.io/local_vars.yml" ;; *) From d1360171c170272ebe6c3c546579eade75217159 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 19 Jul 2018 17:20:49 -0400 Subject: [PATCH 02/29] Update iiab-stages.yml --- iiab-stages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iiab-stages.yml b/iiab-stages.yml index 0f0d0ae56..35db6f84f 100644 --- a/iiab-stages.yml +++ b/iiab-stages.yml @@ -6,7 +6,7 @@ - roles/0-init/defaults/main.yml - vars/default_vars.yml - vars/{{ ansible_local.local_facts.os_ver }}.yml - - vars/local_vars.yml + - /etc/iiab/local_vars.yml tasks: From d31735ead94ea296d67c6739403ee2af8d6720ad Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 19 Jul 2018 17:21:30 -0400 Subject: [PATCH 03/29] Update iiab-network.yml --- iiab-network.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iiab-network.yml b/iiab-network.yml index 989108cb3..721bedac9 100644 --- a/iiab-network.yml +++ b/iiab-network.yml @@ -5,7 +5,7 @@ vars_files: - vars/default_vars.yml - vars/{{ ansible_local.local_facts.os_ver }}.yml - - vars/local_vars.yml + - /etc/iiab/local_vars.yml - /etc/iiab/config_vars.yml roles: From f6af40a7f54f344a9eb5e2e9576b8043260f6d4a Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 19 Jul 2018 17:21:53 -0400 Subject: [PATCH 04/29] Update iiab-from-console.yml --- iiab-from-console.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iiab-from-console.yml b/iiab-from-console.yml index 97e8de990..c6275a641 100644 --- a/iiab-from-console.yml +++ b/iiab-from-console.yml @@ -5,7 +5,7 @@ vars_files: - vars/default_vars.yml - vars/{{ ansible_local.local_facts.os_ver }}.yml - - vars/local_vars.yml + - /etc/iiab/local_vars.yml - /etc/iiab/config_vars.yml roles: From 8325bc0dc11284ec5d5bdb9b6cda198c0b1168d8 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 19 Jul 2018 17:22:09 -0400 Subject: [PATCH 05/29] Update run-one-role.yml --- run-one-role.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-one-role.yml b/run-one-role.yml index e1ae27c2f..abd41ff1d 100644 --- a/run-one-role.yml +++ b/run-one-role.yml @@ -5,7 +5,7 @@ vars_files: - vars/default_vars.yml - vars/{{ ansible_local.local_facts.os_ver }}.yml - - vars/local_vars.yml + - /etc/iiab/local_vars.yml - /etc/iiab/config_vars.yml roles: From 2ee6d048bca1a13ee90d38f5e2fef95df6455982 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 19 Jul 2018 17:22:59 -0400 Subject: [PATCH 06/29] Update install-support --- install-support | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install-support b/install-support index 79439f2f7..b5ae9a12e 100755 --- a/install-support +++ b/install-support @@ -14,7 +14,7 @@ then exit 1 fi -sed -i -e "s/openvpn_install: False/openvpn_install: True/" vars/local_vars.yml -sed -i -e "s/openvpn_enabled: False/openvpn_enabled: True/" vars/local_vars.yml +sed -i -e "s/openvpn_install: False/openvpn_install: True/" /etc/iiab/local_vars.yml +sed -i -e "s/openvpn_enabled: False/openvpn_enabled: True/" /etc/iiab/local_vars.yml ansible-playbook -i $INVENTORY $PLAYBOOK --connection=local From 419a4b829663ba6d4941536133444436a63c52ab Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 19 Jul 2018 17:23:19 -0400 Subject: [PATCH 07/29] Update iiab-base.yml --- iiab-base.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iiab-base.yml b/iiab-base.yml index adf698fb9..de2238008 100644 --- a/iiab-base.yml +++ b/iiab-base.yml @@ -5,7 +5,7 @@ vars_files: - vars/default_vars.yml - vars/{{ ansible_local.local_facts.os_ver }}.yml - - vars/local_vars.yml + - /etc/iiab/local_vars.yml roles: - { role: 0-init, tags: ['0-init'] } From 07754401b5955c6e7c2ea4d2a83286ae9a51836c Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 19 Jul 2018 17:23:50 -0400 Subject: [PATCH 08/29] Update iiab.yml --- iiab.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iiab.yml b/iiab.yml index 721203544..d387a1d7c 100644 --- a/iiab.yml +++ b/iiab.yml @@ -5,7 +5,7 @@ vars_files: - vars/default_vars.yml - vars/{{ ansible_local.local_facts.os_ver }}.yml - - vars/local_vars.yml + - /etc/iiab/local_vars.yml - /etc/iiab/config_vars.yml roles: From fab541f31a28c29292fedb1e3e26f499cf4388b8 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 19 Jul 2018 17:55:12 -0400 Subject: [PATCH 09/29] Update CONTRIBUTING.md --- CONTRIBUTING.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0f543665a..234f5f934 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,7 +2,7 @@ Contributing to Internet-in-a-Box (IIAB) ======================================= Internet-in-a-Box runs on various GNU/Linux operating systems such as Fedora, Ubuntu, Debian, CentOS and Raspbian. -You can install Internet-in-a-Box on most late model desktop and laptop computers. It also supports Intel NUC, Intel Gigabyte BRIX, OLPC XO-1.5, XO-1.75, XO-4, Raspberry Pi 2 and Raspberry Pi 3. A VirtualBox VM can also used for testing purposes. Using Docker containers however is not recommended as our Ansible provisioning system requires low-level access to the operating system. +You can install Internet-in-a-Box on x86_64 PCs/laptops and Raspberry Pi 3 (or 3 B+). Example PC's include Intel NUC and Gigabyte BRIX. Partial support is also available on OLPC laptops like the XO-1.5, XO-1.75 and XO-4. A VirtualBox VM can also used for testing purposes. Using Docker containers however is not recommended as our Ansible provisioning system requires low-level access to the operating system. Finally, running Internet-in-a-Box on the Raspberry Pi Zero W is also possible, if you transfer a working IIAB (microSD card) that was built up inside a Raspberry Pi 3. Please refer to [IIAB Platforms](https://github.com/iiab/iiab/wiki/IIAB-Platforms) for more information. @@ -11,12 +11,12 @@ Internet-in-a-Box uses [Ansible](https://www.ansible.com/) infrastructure automa ├── roles │ ├── 1-prep │ │ ├─ defaults -| | | ├──main.yml (lowest precedence variable definitions, overridden by /vars/default_vars.yml, overridden by ./vars/local_vars.yml. +| | | ├──main.yml (lowest precedence variable definitions, overridden by /vars/default_vars.yml, overridden by /etc/iiab/local_vars.yml) │ │ ├── README.rst │ │ ├── tasks | | | ├──main.yml (specifies the actions to install this role │ │ └── templates -| | | ├<(text files where ansible variables are substituted, specified via {% %} containers-(jinja2 language). +| | | ├── %} containers-(jinja2 language)> │ ├── 2-common │ │ ├── README.rst │ │ ├── tasks @@ -24,11 +24,11 @@ Internet-in-a-Box uses [Ansible](https://www.ansible.com/) infrastructure automa ``` At runtime, Ansible gathers system information and makes it available (called 'facts') and combines this with playbook defined 'variables' to guide the installation process. The execution follows a sequence of cascading steps: -1. Bash script `./runansible` follows instructions in `iiab.yml` in the root directory. +1. Bash script `./iiab-install` follows instructions in `iiab-stages.yml` in the root directory. -2. `iiab.yml` calls 9 aggregate roles (the numbered directories under `./roles/`). +2. `iiab-stages.yml` calls 9 aggregate roles (AKA stages, these are the numbered directories under `./roles/`) and then the network role. (Aside: the network role can also later be run using `./iiab-network`) -3. Each aggregate role has a `/meta/main.yml` which calls the individual named roles. +3. Each aggregate role AKA stage has a `/meta/main.yml` which calls its needed roles. Please refer to the [IIAB Architecture](https://github.com/iiab/iiab/wiki/IIAB-Architecture) and [IIAB Variables]( https://github.com/iiab/iiab/wiki/IIAB-Variables) pages for more information. From 5a504224753e9e6ab4e5b5c7bca5a30b41bee3ee Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 19 Jul 2018 18:00:19 -0400 Subject: [PATCH 10/29] Update iiab-install --- iiab-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iiab-install b/iiab-install index f6d5cd554..ab6c17ff3 100755 --- a/iiab-install +++ b/iiab-install @@ -127,7 +127,7 @@ if [ ! -f /etc/iiab/local_vars.yml ]; then ;; centos | debian | ubuntu | raspbian) cp ./vars/local_vars_medium.yml /etc/iiab/local_vars.yml - echo -e "\/etc/iiab/local_vars.yml created from local_vars_medium.yml defaults." + echo -e "\n/etc/iiab/local_vars.yml created from local_vars_medium.yml defaults." echo "See MIN/MEDIUM/BIG options @ http://wiki.iiab.io/local_vars.yml" ;; *) From a9d42b1b24d6735db6c8138b5b43e56d77c13c4c Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 19 Jul 2018 20:26:19 -0400 Subject: [PATCH 11/29] Rename iiab.yml to iiab.yml.deprecated --- iiab.yml => iiab.yml.deprecated | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename iiab.yml => iiab.yml.deprecated (100%) diff --git a/iiab.yml b/iiab.yml.deprecated similarity index 100% rename from iiab.yml rename to iiab.yml.deprecated From 27ec80c5938a739ac605343b4ba167f5579a7f33 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 19 Jul 2018 22:01:57 -0400 Subject: [PATCH 12/29] Update main.yml --- roles/kolibri/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kolibri/defaults/main.yml b/roles/kolibri/defaults/main.yml index 1d9f660bf..990ac7b5e 100644 --- a/roles/kolibri/defaults/main.yml +++ b/roles/kolibri/defaults/main.yml @@ -1,5 +1,5 @@ # The values here are defaults. -# To override them edit /opt/iiab/iiab/vars/local_vars.yml +# To override them edit /etc/iiab/local_vars.yml # Installation Variables kolibri_install: False From 570b96731e83b6f979c0a5e79c4acd29f79b6834 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 19 Jul 2018 22:03:56 -0400 Subject: [PATCH 13/29] Update main.yml --- roles/calibre/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/calibre/defaults/main.yml b/roles/calibre/defaults/main.yml index 4cbfc1caa..a89171f8b 100644 --- a/roles/calibre/defaults/main.yml +++ b/roles/calibre/defaults/main.yml @@ -21,5 +21,5 @@ calibre_src_url: "https://raw.githubusercontent.com/kovidgoyal/calibre/master/se # USE TO TEST debs.yml (RASPBIAN APPROACH!) ON DEBIAN 9.X: (now handled by calibre_via_debs in /opt/iiab/iiab/vars/*) #calibre_debs_on_debian: True -# Enable unstable .deb's, not just testing .deb's: (moved to vars/local_vars.yml & vars/default_vars.yml) +# Enable unstable .deb's, not just testing .deb's: (moved to /etc/iiab/local_vars.yml & /opt/iiab/iiab/vars/default_vars.yml) #calibre_unstable_debs: False From 6e70ee960d0f35e4beacde010f00eed72b25ffa3 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 19 Jul 2018 22:04:52 -0400 Subject: [PATCH 14/29] Update calibre.conf --- roles/calibre/templates/calibre.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/calibre/templates/calibre.conf b/roles/calibre/templates/calibre.conf index 7318a51fb..5f5317268 100644 --- a/roles/calibre/templates/calibre.conf +++ b/roles/calibre/templates/calibre.conf @@ -1,4 +1,4 @@ -# http://box/XYZ mnemonic if properly set within /opt/iiab/iiab/vars/local_vars.yml +# http://box/XYZ mnemonic if properly set within /etc/iiab/local_vars.yml ProxyPass /{{ calibre_web_path }} http://localhost:{{ calibre_port }} ProxyPassReverse /{{ calibre_web_path }} http://localhost:{{ calibre_port }} From daa3c2d86d461de5469e7a126c24b543c917a8ce Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 19 Jul 2018 22:06:16 -0400 Subject: [PATCH 15/29] Update main.yml --- roles/kalite/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kalite/defaults/main.yml b/roles/kalite/defaults/main.yml index e2c992e1e..3d4683c0f 100644 --- a/roles/kalite/defaults/main.yml +++ b/roles/kalite/defaults/main.yml @@ -1,5 +1,5 @@ # The values here are defaults. -# To override them edit the main var definitions in /opt/iiab/iiab/vars/local_vars.yml +# To override them edit /etc/iiab/local_vars.yml kalite_install: True kalite_enabled: False From 5e2fa847f2e95d3005dfc8714bcc444699f96971 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 19 Jul 2018 22:06:59 -0400 Subject: [PATCH 16/29] Update README.rst --- roles/4-server-options/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/4-server-options/README.rst b/roles/4-server-options/README.rst index ca4afb22a..61d79f77e 100644 --- a/roles/4-server-options/README.rst +++ b/roles/4-server-options/README.rst @@ -2,7 +2,7 @@ 4-server-options README ======================= -Whereas 3-base-server installs critical packages needed by all, this 4th stage installs a broad array of *options* -- depending on which server apps will be installed in later stages -- as specified in /opt/iiab/iiab/vars/local_vars.yml +Whereas 3-base-server installs critical packages needed by all, this 4th stage installs a broad array of *options* -- depending on which server apps will be installed in later stages -- as specified in /etc/iiab/local_vars.yml This includes some networking fundamentals, before they're configured later on. From 57e97fd2bddbedcafe0601ba8f5fce856fe2fea0 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 19 Jul 2018 22:07:57 -0400 Subject: [PATCH 17/29] Update README.rst --- roles/rachel/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/rachel/README.rst b/roles/rachel/README.rst index ac07828cb..31aa1453d 100644 --- a/roles/rachel/README.rst +++ b/roles/rachel/README.rst @@ -13,7 +13,7 @@ Do the following: * cd /library/rachel * mv /library/rachelusb_32EN_3.1.4/RACHEL/bin . * you should see /library/rachel/bin/www/index.php -* re-run ansible (making sure that rachel_enabled: True has been set in vars/local_vars.yml +* re-run ansible (making sure that rachel_enabled: True has been set in /etc/iiab/local_vars.yml Locations --------- From 7866041f2b203530d4fb42c67a6c84939860b0c3 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 19 Jul 2018 22:09:15 -0400 Subject: [PATCH 18/29] Update main.yml --- roles/network/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/network/defaults/main.yml b/roles/network/defaults/main.yml index 61f622f03..9adbf7ad8 100644 --- a/roles/network/defaults/main.yml +++ b/roles/network/defaults/main.yml @@ -44,7 +44,7 @@ hostapd_wait: 1 host_wifi_mode: g host_channel: 6 host_wireless_n: False -# Below moved to /opt/iiab/iiab/vars/local_vars.yml: (so implementer sets this) +# Below moved to /etc/iiab/local_vars.yml: (so implementer sets this) #host_country_code: US hostapd_secure: True hostapd_password: "iiab2017" From 5fd35fa48861060d7e63b46f69f119de55f4ff82 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 19 Jul 2018 22:18:34 -0400 Subject: [PATCH 19/29] Update default_vars.yml --- vars/default_vars.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index ce69cc687..498087dee 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -1,7 +1,7 @@ # WARNING: DO NOT MODIFY THIS FILE. # CHANGES WILL BE LOST IF YOU DO A GIT PULL OR FETCH. -# Instead put changes in local_vars.yml which is not tracked by git: -# http://wiki.iiab.io/local_vars.yml +# Instead put changes in your own /etc/iiab/local_vars.yml +# See http://wiki.iiab.io/local_vars.yml to learn more! # By convention we use True/False to indicate boolean constants. @@ -64,7 +64,7 @@ lan_netmask: 255.255.224.0 # Internal Wi-Fi Access Point # Values are used if there is an internal Wi-Fi adapter and hostapd is enabled # The platform variable adapts install to specific hardware (raspberry pi=rpi2) -# Raspbian req WiFi country since March 2018. CHANGE IT IN vars/local_vars.yml +# Raspbian req WiFi country since March 2018. CHANGE IT IN /etc/iiab/local_vars.yml host_country_code: US host_ssid: "Internet in a Box" host_wifi_mode: g @@ -193,15 +193,15 @@ openvpn_enabled: False # roles/network runs here (MANY SETTINGS ABOVE) # Homepage -# Default to the GUI where the selection is made or override in local_vars.yml iiab_home_url: /home -# You can change iiab_home_url in local_vars.yml in order to get a different -# homepage. For example one of the following: (assuming they are enabled) +# You can change iiab_home_url in /etc/iiab/local_vars.yml to get a different +# homepage. For example one of the following: (if service is enabled!) # iiab_home_url: /home # iiab_home_url: /wordpress -# iiab_home_url: /wiki - either dokuwiki or mediawiki +# iiab_home_url: /wiki # for dokuwiki +# iiab_home_url: /mediawiki # PostgreSQL auto-installed by Moodle &/or Pathagar as nec, no need to touch! # roles/1-prep/tasks/computed_vars.yml, roles/4-server-options/tasks/main.yml @@ -413,9 +413,10 @@ xovis_chart_heading: "My School: Usage Data Visualization" # wide to narrow is_debuntu: False is_ubuntu: False -is_ubuntu_16: False is_ubuntu_18: False +is_ubuntu_16: False is_debian: False +is_debian_10: False is_debian_9: False is_debian_8: False is_rpi: False From 80a101f55205ad12e51565ee2a831e4405f48e42 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 19 Jul 2018 22:20:08 -0400 Subject: [PATCH 20/29] Update CONTRIBUTING.md --- CONTRIBUTING.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 234f5f934..554c4dd5a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,7 +2,9 @@ Contributing to Internet-in-a-Box (IIAB) ======================================= Internet-in-a-Box runs on various GNU/Linux operating systems such as Fedora, Ubuntu, Debian, CentOS and Raspbian. -You can install Internet-in-a-Box on x86_64 PCs/laptops and Raspberry Pi 3 (or 3 B+). Example PC's include Intel NUC and Gigabyte BRIX. Partial support is also available on OLPC laptops like the XO-1.5, XO-1.75 and XO-4. A VirtualBox VM can also used for testing purposes. Using Docker containers however is not recommended as our Ansible provisioning system requires low-level access to the operating system. Finally, running Internet-in-a-Box on the Raspberry Pi Zero W is also possible, if you transfer a working IIAB (microSD card) that was built up inside a Raspberry Pi 3. +You can install Internet-in-a-Box on x86_64 PCs/laptops and Raspberry Pi 3 (or 3 B+). Example PC's include Intel NUC and Gigabyte BRIX. Partial support is also available on OLPC laptops like the XO-1.5, XO-1.75 and XO-4. A VirtualBox VM can also be used for testing purposes. Using Docker containers however is not recommended as our Ansible provisioning system requires low-level access to the operating system. + +Finally, running Internet-in-a-Box on the Raspberry Pi Zero W is also possible, if you transfer a working IIAB (microSD card) that was built up inside a Raspberry Pi 3. Please refer to [IIAB Platforms](https://github.com/iiab/iiab/wiki/IIAB-Platforms) for more information. From 6e6c9686c89f7ca669116ce1a1c02a25ec989d6a Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 19 Jul 2018 22:20:40 -0400 Subject: [PATCH 21/29] Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 554c4dd5a..e81236bbe 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,7 +4,7 @@ Internet-in-a-Box runs on various GNU/Linux operating systems such as Fedora, Ub You can install Internet-in-a-Box on x86_64 PCs/laptops and Raspberry Pi 3 (or 3 B+). Example PC's include Intel NUC and Gigabyte BRIX. Partial support is also available on OLPC laptops like the XO-1.5, XO-1.75 and XO-4. A VirtualBox VM can also be used for testing purposes. Using Docker containers however is not recommended as our Ansible provisioning system requires low-level access to the operating system. -Finally, running Internet-in-a-Box on the Raspberry Pi Zero W is also possible, if you transfer a working IIAB (microSD card) that was built up inside a Raspberry Pi 3. +Finally, running Internet-in-a-Box on the Raspberry Pi Zero W is also possible, if you transfer a working IIAB (microSD card) that was built up inside a Raspberry Pi 3 (or 3 B+). Please refer to [IIAB Platforms](https://github.com/iiab/iiab/wiki/IIAB-Platforms) for more information. From 066113d2ab8ce84a43a34915840efa597bd5ccf2 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 19 Jul 2018 22:45:37 -0400 Subject: [PATCH 22/29] Update iiab-install --- iiab-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iiab-install b/iiab-install index ab6c17ff3..3cd9be0d5 100755 --- a/iiab-install +++ b/iiab-install @@ -30,7 +30,7 @@ if [ "$1" != "--debug" ] && [ "$1" != "--reinstall" ] && [ "$1" != "" ]; then echo "Use './iiab-install' for regular installs, or to continue an install." echo "Use './iiab-install --reinstall' to force running all Stages 0-9." echo "Use './iiab-install --debug' to run Stage 0, followed by Stages 3-9." - echo "Use './runtags' to run a single Stage or Tag or Role." + echo "Use './runrole' to run a single Stage or Role." echo "Use './iiab-network' to run Network sections." exit 1 fi From f8a26310298ffc6af404db30038b30c4f41bf845 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 19 Jul 2018 23:14:21 -0400 Subject: [PATCH 23/29] Update iiab-install --- iiab-install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/iiab-install b/iiab-install index 3cd9be0d5..addd648f5 100755 --- a/iiab-install +++ b/iiab-install @@ -110,8 +110,8 @@ if [ -f /etc/iiab/iiab.env ]; then echo "Use './iiab-install --reinstall' to force running all Stages 0-9." echo "Use './iiab-install --debug' to run Stage 0, followed by Stages 3-9." echo "Use './runtags' to run a single Stage or Tag or Role." - echo "Use './iiab-network' to run Network sections." - exit 1 + echo -e "Use './iiab-network' to run Network sections.\n" + exit 0 # allows rerunning http://d.iiab.io/6.6/install.txt fi fi if [ "$STAGE" -lt 2 ] && [ "$1" == "--debug" ]; then From 93a73fac8248b5d0cbd7e29cfc35dfa5c9058227 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 20 Jul 2018 00:41:05 -0400 Subject: [PATCH 24/29] Update default_vars.yml --- vars/default_vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 498087dee..7f28a5f52 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -196,7 +196,7 @@ openvpn_enabled: False iiab_home_url: /home # You can change iiab_home_url in /etc/iiab/local_vars.yml to get a different -# homepage. For example one of the following: (if service is enabled!) +# homepage. For example one of the following: (if its service is enabled!) # iiab_home_url: /home # iiab_home_url: /wordpress From 05d6b3adabc8b5718fb2e028cca7c91e99beb662 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 20 Jul 2018 00:44:40 -0400 Subject: [PATCH 25/29] Update iiab-install --- iiab-install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/iiab-install b/iiab-install index addd648f5..100d06659 100755 --- a/iiab-install +++ b/iiab-install @@ -123,11 +123,11 @@ 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 local_vars_olpc.yml defaults." + 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 local_vars_medium.yml defaults." + 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" ;; *) From 38c63791482ce3feddf5d04b9bc23e0b43a98edc Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 20 Jul 2018 00:58:24 -0400 Subject: [PATCH 26/29] Update ansible --- scripts/ansible | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible b/scripts/ansible index 666485305..6c34bee83 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -74,7 +74,7 @@ else #if [[ `grep -qi ansible /etc/apt/sources.list` ]] || [ -f /etc/apt/sources.list.d/ansible*.list ]; then elif (grep -qi ansible /etc/apt/sources.list) || (ls /etc/apt/sources.list.d/*ansible*.list >/dev/null 2>&1) ; then #echo "Ansible repo(s) found within /etc/apt/sources.list*" - echo -e 'MANUAL INTERVENTION URGED:\nANSIBLE REPO(S) FOUND WITHIN /etc/apt/sources.list AND/OR /etc/apt/sources.list.d/*ansible*.list -- MUST CONTAIN LINE "deb http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main" IF YOU WANT THE LATEST ANSIBLE -- AND REMOVE ALL SIMILAR LINES TO ENSURE ANSIBLE UPDATES CLEANLY -- then re-run this script.\n' + echo -e 'CONSIDER MANUAL INTERVENTION:\nANSIBLE REPO(S) FOUND WITHIN /etc/apt/sources.list AND/OR /etc/apt/sources.list.d/*ansible*.list -- MUST CONTAIN LINE "deb http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main" IF YOU WANT THE LATEST ANSIBLE -- AND REMOVE ALL SIMILAR LINES TO ENSURE ANSIBLE UPDATES CLEANLY -- then re-run this script.\n' else echo -e 'Upstream ansible source repo not found:\nPLEASE UNINSTALL ANSIBLE (run "apt purge ansible" or "pip uninstall ansible", depending how Ansible was originally installed) THEN RE-RUN THIS SCRIPT.' exit 1 From fc66341299bc4ad132cbb26fc26a9d24acec4956 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 20 Jul 2018 00:58:54 -0400 Subject: [PATCH 27/29] Update ansible-2.6.x --- scripts/ansible-2.6.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible-2.6.x b/scripts/ansible-2.6.x index f8cf8b077..bbb178b45 100755 --- a/scripts/ansible-2.6.x +++ b/scripts/ansible-2.6.x @@ -74,7 +74,7 @@ else #if [[ `grep -qi ansible /etc/apt/sources.list` ]] || [ -f /etc/apt/sources.list.d/ansible*.list ]; then elif (grep -qi ansible /etc/apt/sources.list) || (ls /etc/apt/sources.list.d/*ansible*.list >/dev/null 2>&1) ; then #echo "Ansible repo(s) found within /etc/apt/sources.list*" - echo -e 'MANUAL INTERVENTION URGED:\nANSIBLE REPO(S) FOUND WITHIN /etc/apt/sources.list AND/OR /etc/apt/sources.list.d/*ansible*.list -- MUST CONTAIN LINE "deb http://ppa.launchpad.net/ansible/ansible-2.6/ubuntu xenial main" IF YOU WANT THE LATEST ANSIBLE 2.6.x -- AND REMOVE ALL SIMILAR LINES TO ENSURE ANSIBLE UPDATES CLEANLY -- then re-run this script.\n' + echo -e 'CONSIDER MANUAL INTERVENTION:\nANSIBLE REPO(S) FOUND WITHIN /etc/apt/sources.list AND/OR /etc/apt/sources.list.d/*ansible*.list -- MUST CONTAIN LINE "deb http://ppa.launchpad.net/ansible/ansible-2.6/ubuntu xenial main" IF YOU WANT THE LATEST ANSIBLE 2.6.x -- AND REMOVE ALL SIMILAR LINES TO ENSURE ANSIBLE UPDATES CLEANLY -- then re-run this script.\n' else echo -e 'Upstream ansible source repo not found:\nPLEASE UNINSTALL ANSIBLE (run "apt purge ansible" or "pip uninstall ansible", depending how Ansible was originally installed) THEN RE-RUN THIS SCRIPT.' exit 1 From c1b0524649ff6cafad3415c7361810f2454e9b27 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 20 Jul 2018 01:26:11 -0400 Subject: [PATCH 28/29] Update iiab-install --- iiab-install | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/iiab-install b/iiab-install index 100d06659..d833a27f8 100755 --- a/iiab-install +++ b/iiab-install @@ -14,6 +14,8 @@ MIN_ANSIBLE_VER=2.5.6 export ANSIBLE_LOG_PATH="$CWD/iiab-install.log" +echo -e "\n\n./iiab-install BEGUN IN /opt/iiab/iiab\n" + if [ ! -f /etc/ansible/facts.d/local_facts.fact ]; then mkdir -p /etc/ansible/facts.d fi @@ -109,8 +111,8 @@ if [ -f /etc/iiab/iiab.env ]; then echo -e "\nEXITING: STAGE (counter) in /etc/iiab/iiab.env shows Stage 9 Is Already Done." echo "Use './iiab-install --reinstall' to force running all Stages 0-9." echo "Use './iiab-install --debug' to run Stage 0, followed by Stages 3-9." - echo "Use './runtags' to run a single Stage or Tag or Role." - echo -e "Use './iiab-network' to run Network sections.\n" + echo "Use './runrole' to run a single Stage or Role." + echo -e "Use './iiab-network' to run Network sections.\n\n" exit 0 # allows rerunning http://d.iiab.io/6.6/install.txt fi fi @@ -142,3 +144,5 @@ echo -e "\nRunning local playbooks....Stage 0 will now run....followed by Stages ansible -m setup -i $INVENTORY localhost --connection=local >> /dev/null ansible-playbook -i $INVENTORY $PLAYBOOK ${ARGS} --connection=local + +echo -e "\n./iiab-install COMPLETED IN /opt/iiab/iiab\n\n" From 383c46de620f4b988e21ea5aa292a79ad125eedc Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 20 Jul 2018 01:28:05 -0400 Subject: [PATCH 29/29] Update iiab-install --- iiab-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iiab-install b/iiab-install index d833a27f8..1a058495e 100755 --- a/iiab-install +++ b/iiab-install @@ -113,7 +113,7 @@ if [ -f /etc/iiab/iiab.env ]; then echo "Use './iiab-install --debug' to run Stage 0, followed by Stages 3-9." echo "Use './runrole' to run a single Stage or Role." echo -e "Use './iiab-network' to run Network sections.\n\n" - exit 0 # allows rerunning http://d.iiab.io/6.6/install.txt + exit 0 # allows rerunning http://download.iiab.io/6.6/install.txt fi fi if [ "$STAGE" -lt 2 ] && [ "$1" == "--debug" ]; then