Merge pull request #84 from iiab/master

sync from iiab/iiab

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
+remote_tmp = /library/working/.ansible/tmp
-local_tmp = $HOME/.ansible/tmp
+local_tmp = /library/working/.ansible/tmp

roles/httpd/tasks/main.yml

@@ -31,6 +31,11 @@
      - download
    when: is_ubuntu
 
+- name: Sqlite3 no longer included in another  package in ubuntu18
+  package:
+    name: php{{ php_version }}-sqlite3
+  when: is_ubuntu_18
+
 - name: Install httpd required packages (redhat)
   package:
     name: "{{ item }}"

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

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

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 }}

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

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

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

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

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

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

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

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