Merge pull request #446 from iiab/master

Sync from iiab/iiab:master

roles/internetarchive/tasks/install.yml

@@ -9,10 +9,10 @@
   include_role:
     name: nodejs
 
-- name: FAIL (STOP INSTALLING) IF nodejs_version is not set to 10.x or 12.x
+- name: FAIL (STOP INSTALLING) IF nodejs_version is not set to 10.x, 12.x or 14.x
   fail:
-    msg: "Internet Archive install cannot proceed, as it currently requires Node.js 10.x or 12.x, and your nodejs_version is set to {{ nodejs_version }}.  Please check the value of nodejs_version in /opt/iiab/iiab/vars/default_vars.yml and possibly also /etc/iiab/local_vars.yml"
+    msg: "Internet Archive install cannot proceed, as it currently requires Node.js 10.x or 12.x or 14.x, and your nodejs_version is set to {{ nodejs_version }}.  Please check the value of nodejs_version in /opt/iiab/iiab/vars/default_vars.yml and possibly also /etc/iiab/local_vars.yml"
-  when: (nodejs_version != "10.x") and (nodejs_version != "12.x")
+  when: (nodejs_version != "10.x") and (nodejs_version != "12.x") and (nodejs_version != "14.x")
 
 - name: "Set 'yarn_install: True' and 'yarn_enabled: True'"
   set_fact:

roles/network/tasks/NM-debian.yml

@@ -76,6 +76,6 @@
 
 - name: Restart the NetworkManager service
   systemd:
-    name: network-manager
+    name: NetworkManager
     state: restarted
   when: not nobridge is defined and not no_net_restart

roles/network/tasks/hostapd.yml

@@ -93,7 +93,7 @@
     state: absent
   when: is_raspbian and not wifi_up_down
 
-- name: Create networkd-dispatcher diagnosic hook for recording network events
+- name: Create networkd-dispatcher diagnostic hook for recording network events
   template:
     owner: root
     group: root

roles/network/templates/hostapd/clone-wifi.service.j2

@@ -5,7 +5,7 @@ After=network-pre.target
 Before=dhcpcd.service
 Before=wpa_supplicant.service
 Before=wpa_supplicant@{{ discovered_wireless_iface }}.service
-Before=network-manager.service
+Before=NetworkManager.service
 Before=netplan-wpa@{{ discovered_wireless_iface }}.service
 Before=hostapd.service
 

roles/network/templates/hostapd/hostapd.service.j2

@@ -5,9 +5,9 @@ After=network-pre.target
 After=clone-wifi.service
 Requires=clone-wifi.service
 Before=dhcpcd.service
-Before=wpa_supplicant@{{ discovered_wireless_iface  }}.service
+Before=wpa_supplicant@{{ discovered_wireless_iface }}.service
-Before=network-manager.service
+Before=NetworkManager.service
-Before=netplan-wpa-{{ discovered_wireless_iface  }}.service
+Before=netplan-wpa-{{ discovered_wireless_iface }}.service
 Before=network.target
 
 [Service]

roles/network/templates/hostapd/wifi-test.service.j2

@@ -4,9 +4,9 @@ After=wpa_supplicant.service
 Wants=wpa_supplicant.service
 Before=hostapd.service
 Before=dhcpcd.service
-Before=wpa_supplicant@{{ discovered_wireless_iface  }}.service
+Before=wpa_supplicant@{{ discovered_wireless_iface }}.service
-Before=network-manager.service
+Before=NetworkManager.service
-Before=netplan-wpa-{{ discovered_wireless_iface  }}.service
+Before=netplan-wpa-{{ discovered_wireless_iface }}.service
 Before=network.target
 
 [Service]
@@ -16,4 +16,3 @@ ExecStart=/sbin/test-wifi
 
 [Install]
 WantedBy=multi-user.target
-

roles/nodered/tasks/install.yml

@@ -26,10 +26,11 @@
     msg: "Node-RED install cannot proceed, as Node.js is not installed."
   when: nodejs_installed is undefined
 
-- name: FAIL (STOP THE INSTALL) IF 'nodejs_version != "12.x"'
+# 2020-10-29: not really be nec as Node-RED supports recent Node.js versions
-  fail:
+#- name: FAIL (STOP THE INSTALL) IF 'nodejs_version != "12.x"'
-    msg: "Node-RED install cannot proceed, as it currently requires Node.js 12.x, whereas nodejs_version is set to {{ nodejs_version }}.  Please check the value of nodejs_version in /opt/iiab/iiab/vars/default_vars.yml, /etc/iiab/local_vars.yml, /opt/iiab/iiab/roles/nodejs, etc."
+#  fail:
-  when: nodejs_version != "12.x"
+#    msg: "Node-RED install cannot proceed, as it currently requires Node.js 12.x, whereas nodejs_version is set to {{ nodejs_version }}.  Please check the value of nodejs_version in /opt/iiab/iiab/vars/default_vars.yml, /etc/iiab/local_vars.yml, /opt/iiab/iiab/roles/nodejs, etc."
+#  when: nodejs_version != "12.x"
 
 
 # BRUTAL but ensures consistency across OS's / distros like Raspbian Desktop &

roles/postgresql/tasks/install.yml

@@ -68,32 +68,31 @@
     group: postgres
     mode: '0640'
 
-# Likely No Longer Nec!  Given stanza below does the same...
+- name: Disable & Stop stock 'postgresql' (parent) systemd service
-#- name: 'Stop postgresql service: /etc/init.d/postgresql stop (debuntu)'
-#  command: "/etc/init.d/postgresql stop"
-#  ignore_errors: True
-#  when: postgresql_install and is_debuntu
-
-- name: Disable & Stop stock 'postgresql' systemd service
   systemd:
     name: postgresql
     state: stopped
     enabled: no
 
-- name: Disable & Stop stock 'postgresql@11-main.service' systemd service - debian-10
+# Above parent service postgresql.service uses template postgresql@.service to
-  systemd:
+# start/stop` child service e.g. postgresql@11-main.service on Debian 10, or
-    name: postgresql@11-main.service
+# postgresql@13-main.service on Debian 11. So these 2 stanzas dont do anything:
-    state: stopped
-    enabled: no
-#  when: is_debian_10
-  when: is_debian_10 and not is_raspbian
 
-- name: Disable & Stop stock 'postgresql@' systemd service - debian-10
+# 'systemctl is-enabled postgresql@' shows 'indirect' before + after
-  systemd:
+#- name: Disable stock 'postgresql@' (template) if real Debian
-    name: postgresql@
+#  systemd:
-    enabled: no
+#    name: postgresql@
-#  when: is_debian_10
+#    #state: stopped    # Error if you attempt to stop template
-  when: is_debian_10 and not is_raspbian
+#    enabled: no        # Doesn't do anything
+#  when: is_debian and not is_raspbian
+
+# 'systemctl is-enabled postgresql@13-main.service' shows 'enabled-runtime' before + after
+#- name: Disable & Stop stock 'postgresql@{{ postgresql_version }}-main.service' (child service) if real Debian
+#  systemd:
+#    name: "postgresql@{{ postgresql_version }}-main.service"
+#    state: stopped    # Already done by parent above
+#    enabled: no       # Doesn't do anything
+#  when: is_debian and not is_raspbian
 
 
 # RECORD PostgreSQL AS INSTALLED

run-one-role.yml

@@ -4,7 +4,7 @@
 
   vars_files:
   - vars/default_vars.yml
-  - "vars/{{ ansible_local.local_facts.os_ver }}.yml"
+  - vars/{{ ansible_local.local_facts.os_ver }}.yml
   - /etc/iiab/local_vars.yml
   - /etc/iiab/iiab_state.yml
 

vars/default_vars.yml

@@ -395,7 +395,7 @@ nodejs_install: False
 nodejs_enabled: False
 # Node.js version used by roles/nodejs/tasks/main.yml for 3 roles:
 # nodered (Node-RED), pbx (Asterix, FreePBX) & sugarizer (Sugarizer)
-nodejs_version: 12.x    # was 8.x until 2019-02-02, was 10.x until 2019-12-21
+nodejs_version: 14.x    # was 8.x til 2019-02-02, 10.x til 2019-12-21, 12.x til 2020-10-29
 
 # Flow-based visual programming for wiring together IoT hardware devices etc
 nodered_install: False