From 893b9f646d874621974ff71849752126134f6e93 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 17 May 2018 21:44:50 -0400 Subject: [PATCH 01/15] Update local_vars_min_vpn.yml --- vars/local_vars_min_vpn.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vars/local_vars_min_vpn.yml b/vars/local_vars_min_vpn.yml index 199607ae0..351e01b4a 100644 --- a/vars/local_vars_min_vpn.yml +++ b/vars/local_vars_min_vpn.yml @@ -52,7 +52,7 @@ iiab_gateway_enabled: False # Make this False to disable http://box/common/services/power_off.php button: allow_apache_sudo: True -# Stages 3 & 4 must be run (using iiab-install or runtags) if changing these: +# Stages 3 & 4 must be run (using iiab-install or runrole) if changing these: squid_install: False squid_enabled: False @@ -78,7 +78,7 @@ openvpn_install: True openvpn_enabled: True # The following seems necessary on CentOS: # openvpn_cron_enabled: True -# If changing the above, remember to run "cd /opt/iiab/iiab; ./runtags openvpn" +# If changing the above, remember to run "cd /opt/iiab/iiab; ./runrole openvpn" # roles/network runs here (MANY SETTINGS ABOVE) @@ -180,7 +180,7 @@ pathagar_enabled: False 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 "./runtags sugarizer" fail +# 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 9e6ba0e3c672f47b33f829f1cc0253c4ece0f04c Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 17 May 2018 21:45:40 -0400 Subject: [PATCH 02/15] Update local_vars_min.yml --- vars/local_vars_min.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index 644c54c90..a29a150db 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -52,7 +52,7 @@ iiab_gateway_enabled: False # Make this False to disable http://box/common/services/power_off.php button: allow_apache_sudo: True -# Stages 3 & 4 must be run (using iiab-install or runtags) if changing these: +# Stages 3 & 4 must be run (using iiab-install or runrole) if changing these: squid_install: False squid_enabled: False @@ -78,7 +78,7 @@ openvpn_install: True openvpn_enabled: False # The following seems necessary on CentOS: # openvpn_cron_enabled: True -# If changing the above, remember to run "cd /opt/iiab/iiab; ./runtags openvpn" +# If changing the above, remember to run "cd /opt/iiab/iiab; ./runrole openvpn" # roles/network runs here (MANY SETTINGS ABOVE) @@ -180,7 +180,7 @@ pathagar_enabled: False 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 "./runtags sugarizer" fail +# 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 fceb274e76622c25f3ec4a30373bd7c94bb75db0 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 17 May 2018 21:46:16 -0400 Subject: [PATCH 03/15] Update local_vars_medium_vpn.yml --- vars/local_vars_medium_vpn.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vars/local_vars_medium_vpn.yml b/vars/local_vars_medium_vpn.yml index f1235170f..bb5cfed17 100644 --- a/vars/local_vars_medium_vpn.yml +++ b/vars/local_vars_medium_vpn.yml @@ -52,7 +52,7 @@ iiab_gateway_enabled: False # Make this False to disable http://box/common/services/power_off.php button: allow_apache_sudo: True -# Stages 3 & 4 must be run (using iiab-install or runtags) if changing these: +# Stages 3 & 4 must be run (using iiab-install or runrole) if changing these: squid_install: False squid_enabled: False @@ -78,7 +78,7 @@ openvpn_install: True openvpn_enabled: True # The following seems necessary on CentOS: # openvpn_cron_enabled: True -# If changing the above, remember to run "cd /opt/iiab/iiab; ./runtags openvpn" +# If changing the above, remember to run "cd /opt/iiab/iiab; ./runrole openvpn" # roles/network runs here (MANY SETTINGS ABOVE) @@ -180,7 +180,7 @@ pathagar_enabled: False 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 "./runtags sugarizer" fail +# 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 c0ab6a19406c3e19d3583de9d3f0ae89f9f13c59 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 17 May 2018 21:46:45 -0400 Subject: [PATCH 04/15] Update local_vars_medium.yml --- vars/local_vars_medium.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index a747a48f0..8e3b2cb0f 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -52,7 +52,7 @@ iiab_gateway_enabled: False # Make this False to disable http://box/common/services/power_off.php button: allow_apache_sudo: True -# Stages 3 & 4 must be run (using iiab-install or runtags) if changing these: +# Stages 3 & 4 must be run (using iiab-install or runrole) if changing these: squid_install: False squid_enabled: False @@ -78,7 +78,7 @@ openvpn_install: True openvpn_enabled: False # The following seems necessary on CentOS: # openvpn_cron_enabled: True -# If changing the above, remember to run "cd /opt/iiab/iiab; ./runtags openvpn" +# If changing the above, remember to run "cd /opt/iiab/iiab; ./runrole openvpn" # roles/network runs here (MANY SETTINGS ABOVE) @@ -180,7 +180,7 @@ pathagar_enabled: False 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 "./runtags sugarizer" fail +# 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 6e411e47cf3b5b4e54cba4af8be135fa8b2b1ea0 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 17 May 2018 21:47:39 -0400 Subject: [PATCH 05/15] Update local_vars_big_vpn.yml --- vars/local_vars_big_vpn.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vars/local_vars_big_vpn.yml b/vars/local_vars_big_vpn.yml index ad2ee5d15..699ebc145 100644 --- a/vars/local_vars_big_vpn.yml +++ b/vars/local_vars_big_vpn.yml @@ -52,7 +52,7 @@ iiab_gateway_enabled: False # Make this False to disable http://box/common/services/power_off.php button: allow_apache_sudo: True -# Stages 3 & 4 must be run (using iiab-install or runtags) if changing these: +# Stages 3 & 4 must be run (using iiab-install or runrole) if changing these: squid_install: True squid_enabled: True @@ -78,7 +78,7 @@ openvpn_install: True openvpn_enabled: True # The following seems necessary on CentOS: # openvpn_cron_enabled: True -# If changing the above, remember to run "cd /opt/iiab/iiab; ./runtags openvpn" +# If changing the above, remember to run "cd /opt/iiab/iiab; ./runrole openvpn" # roles/network runs here (MANY SETTINGS ABOVE) @@ -180,7 +180,7 @@ pathagar_enabled: False 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 "./runtags sugarizer" fail +# 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 3ef72d4d7fbf0982523dd6b40375dcfd49381b0a Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 17 May 2018 21:48:02 -0400 Subject: [PATCH 06/15] Update local_vars_big.yml --- vars/local_vars_big.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index bf319ce2a..d89b264d5 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -52,7 +52,7 @@ iiab_gateway_enabled: False # Make this False to disable http://box/common/services/power_off.php button: allow_apache_sudo: True -# Stages 3 & 4 must be run (using iiab-install or runtags) if changing these: +# Stages 3 & 4 must be run (using iiab-install or runrole) if changing these: squid_install: True squid_enabled: True @@ -78,7 +78,7 @@ openvpn_install: True openvpn_enabled: False # The following seems necessary on CentOS: # openvpn_cron_enabled: True -# If changing the above, remember to run "cd /opt/iiab/iiab; ./runtags openvpn" +# If changing the above, remember to run "cd /opt/iiab/iiab; ./runrole openvpn" # roles/network runs here (MANY SETTINGS ABOVE) @@ -180,7 +180,7 @@ pathagar_enabled: False 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 "./runtags sugarizer" fail +# 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 f8a45955f7a0a313e8e79d8e1743ac34a7fbc1d8 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 18 May 2018 12:08:30 -0400 Subject: [PATCH 07/15] Update ansible --- scripts/ansible | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible b/scripts/ansible index 281995e15..98a8af213 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -4,7 +4,7 @@ echo -e '\nATTEMPTING TO INSTALL THE LATEST (RELEASED VERSION OF) ANSIBLE.' echo -e 'Ensure you'"'"'re online before running this script!' echo -e 'OR: consider scripts/ansible-2.4.x or scripts/ansible/2.5.x "slow food" instead.\n' -GOOD_VER="2.5.2" # Ansible version for OLPC XO laptops (pip install). +GOOD_VER="2.5.3" # Ansible version for OLPC XO laptops (pip install). # On other OS's we install/upgrade to THE latest (released version of) Ansible. CURR_VER="undefined" # below are unused for future use From b5bbfc423421a45fb71989f2597481a08cc4e6b8 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 18 May 2018 12:08:44 -0400 Subject: [PATCH 08/15] Update ansible-2.5.x --- scripts/ansible-2.5.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible-2.5.x b/scripts/ansible-2.5.x index 6b4ac0541..e2cb88aaf 100755 --- a/scripts/ansible-2.5.x +++ b/scripts/ansible-2.5.x @@ -4,7 +4,7 @@ echo -e '\nATTEMPTING TO INSTALL THE LATEST ANSIBLE 2.5.x' echo -e 'Ensure you'"'"'re online before running this script!' echo -e 'OR: consider scripts/ansible to keep up-to-date with Ansible'"'"'s evolution.\n' -GOOD_VER="2.5.2" # Ansible version for OLPC XO laptops (pip install). +GOOD_VER="2.5.3" # Ansible version for OLPC XO laptops (pip install). # On other OS's we attempt to install/upgrade/pin to the latest Ansible 2.5.x CURR_VER="undefined" # below are unused for future use From 5ca184297efb9b8c1a307450060c727d5b96b2bd Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sun, 20 May 2018 11:34:02 -0500 Subject: [PATCH 09/15] handle systemd-networkd having enabled-runtime --- roles/network/tasks/detected_network.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/roles/network/tasks/detected_network.yml b/roles/network/tasks/detected_network.yml index 3df31bacd..c3f5855c5 100644 --- a/roles/network/tasks/detected_network.yml +++ b/roles/network/tasks/detected_network.yml @@ -28,6 +28,11 @@ systemd_networkd_active: True when: 'ansible_local.local_facts.systemd_networkd == "enabled"' +- name: Setting systemd_networkd-2 results + set_fact: + systemd_networkd_active: True + when: 'ansible_local.local_facts.systemd_networkd == "enabled-runtime"' + - name: Setting network_manager results set_fact: network_manager_active: True From 7501d256f8ae3d96b3b075a9ed794d73203d22e7 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sun, 20 May 2018 11:57:10 -0500 Subject: [PATCH 10/15] handle different netplan file name --- roles/network/tasks/sysd-netd-debian.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/roles/network/tasks/sysd-netd-debian.yml b/roles/network/tasks/sysd-netd-debian.yml index ae5c17f34..804e314d7 100644 --- a/roles/network/tasks/sysd-netd-debian.yml +++ b/roles/network/tasks/sysd-netd-debian.yml @@ -38,13 +38,18 @@ wan_cidr: "{{ CIDR.stdout }}" when: wan_ip != "dhcp" +- name: Figure out netplan file name on Ubuntu 18 + shell: ls /etc/netplan + register: netplan + when: is_ubuntu_18 + # ICO will always set gui_static_wan_ip away from the default of 'unset' while # gui_static_wan turns dhcp on/off through wan_ip in computed_network and # overrides gui_static_wan_ip that is present. Changing wan_ip in local_vars # is a oneway street to static. - name: Supply static template template: - dest: /etc/netplan/50-cloud-init.yaml + dest: /etc/netplan/{{ netplan.stdout }} src: network/cloud-init.j2 backup: no when: (wan_ip != "dhcp" or gui_static_wan_ip == "undefined") and is_ubuntu_18 From d792a1a2291b5ca98d670774e5c6644c9dad7c39 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sun, 20 May 2018 20:03:46 -0500 Subject: [PATCH 11/15] OSM - pin Flask to version 0.12.4 --- roles/osm/tasks/main.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/roles/osm/tasks/main.yml b/roles/osm/tasks/main.yml index 9cb4c3105..2789a2dd5 100644 --- a/roles/osm/tasks/main.yml +++ b/roles/osm/tasks/main.yml @@ -30,6 +30,14 @@ extra_args="--no-cache-dir" when: internet_available and is_debuntu +- name: Install Flask 0.12X + pip: name=Flask + virtualenv={{ osm_venv }} + virtualenv_site_packages=no + version=0.12.4 + extra_args="--no-cache-dir" + when: internet_available and is_debuntu + - name: Install OSM with dependencies pip: name={{ item }} virtualenv={{ osm_venv }} @@ -50,6 +58,14 @@ # extra_args="--no-cache-dir" when: internet_available and not is_debuntu +- name: Install Flask 0.12X + pip: name=Flask + virtualenv={{ osm_venv }} + virtualenv_site_packages=no + version=0.12.4 +# extra_args="--no-cache-dir" + when: internet_available and not is_debuntu + - name: Install OSM with dependencies pip: name={{ item }} virtualenv={{ osm_venv }} From f4c363b8741acbe627f3f3f3a3d72607150efbaa Mon Sep 17 00:00:00 2001 From: George Hunt Date: Mon, 21 May 2018 04:02:00 +0000 Subject: [PATCH 12/15] load php-sqlite on ubuntu --- roles/httpd/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/httpd/tasks/main.yml b/roles/httpd/tasks/main.yml index 76979dd84..e404b3815 100644 --- a/roles/httpd/tasks/main.yml +++ b/roles/httpd/tasks/main.yml @@ -27,6 +27,7 @@ with_items: - apache2 - php + - php{{ php_version }}-sqlite3 tags: - download when: is_ubuntu From 1fc716581d8056fc5958beccf62ed0021d58d053 Mon Sep 17 00:00:00 2001 From: George Hunt Date: Mon, 21 May 2018 13:43:44 +0000 Subject: [PATCH 13/15] do not risk error on earlier version of ubuntu --- ansible.cfg | 4 ++-- roles/httpd/tasks/main.yml | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ansible.cfg b/ansible.cfg index fdfc5e7db..a78e0ba0b 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -3,5 +3,5 @@ [defaults] squash_actions = apk, apt, dnf, homebrew, openbsd_pkg, pacman, pkgng, yum, zypper, package -remote_tmp = $HOME/.ansible/tmp -local_tmp = $HOME/.ansible/tmp +remote_tmp = /tmp/.ansible/tmp +local_tmp = /tmp/.ansible/tmp diff --git a/roles/httpd/tasks/main.yml b/roles/httpd/tasks/main.yml index e404b3815..437d19606 100644 --- a/roles/httpd/tasks/main.yml +++ b/roles/httpd/tasks/main.yml @@ -27,11 +27,15 @@ with_items: - apache2 - php - - php{{ php_version }}-sqlite3 tags: - download when: is_ubuntu +- name: Sqlite3 no longer included in another package in ubuntu18 + package: + name: php{{ php_version }}-sqlite3 + when: is_ubunbu_18 + - name: Install httpd required packages (redhat) package: name: "{{ item }}" From bb5d5cbe03c8653767d840b4a185ff0361f8c9eb Mon Sep 17 00:00:00 2001 From: George Hunt Date: Mon, 21 May 2018 13:53:18 +0000 Subject: [PATCH 14/15] ubunbu ->ubuntu --- roles/httpd/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/httpd/tasks/main.yml b/roles/httpd/tasks/main.yml index 437d19606..de04af0f0 100644 --- a/roles/httpd/tasks/main.yml +++ b/roles/httpd/tasks/main.yml @@ -34,7 +34,7 @@ - name: Sqlite3 no longer included in another package in ubuntu18 package: name: php{{ php_version }}-sqlite3 - when: is_ubunbu_18 + when: is_ubuntu_18 - name: Install httpd required packages (redhat) package: From c7df7c3a4f25442282e11d2f695a3f63ac32c0ea Mon Sep 17 00:00:00 2001 From: George Hunt Date: Mon, 21 May 2018 14:38:04 +0000 Subject: [PATCH 15/15] move the ansible working files to /librar/working --- ansible.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible.cfg b/ansible.cfg index a78e0ba0b..99cd939c9 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -3,5 +3,5 @@ [defaults] squash_actions = apk, apt, dnf, homebrew, openbsd_pkg, pacman, pkgng, yum, zypper, package -remote_tmp = /tmp/.ansible/tmp -local_tmp = /tmp/.ansible/tmp +remote_tmp = /library/working/.ansible/tmp +local_tmp = /library/working/.ansible/tmp