Merge branch 'master' into cwivagg/matomo_20220618

roles/0-init/tasks/validate_vars.yml

@@ -64,15 +64,12 @@
 # 2020-11-04: Fix validation of 5 [now 4] core dependencies, for ./runrole etc
 
 
-- name: Set vars_checklist for 46 + 46 + 42 vars ("XYZ_install" + "XYZ_enabled" + "XYZ_installed") to be checked
+- name: Set vars_checklist for 44 + 44 + 0 vars ("XYZ_install" + "XYZ_enabled" + "XYZ_installed") to be checked
   set_fact:
     vars_checklist:
       - hostapd
-      - dhcpd
-      - named
       - dnsmasq
       - bluetooth
-      #- wondershaper       # Unmaintained
       - sshd
       - openvpn
       - remoteit
@@ -81,18 +78,10 @@
       #- apache             # Unmaintained - former dependency
       #- mysql              # MANDATORY
       - squid
-      #- dansguardian       # Unmaintained
       - cups
       - samba
       - usb_lib
-      #- xo_services        # Unmaintained
-      #- activity_server    # Unmaintained
-      #- ejabberd_xs        # Unmaintained
-      #- idmgr              # Unmaintained
       - azuracast
-      #- dokuwiki           # Unmaintained
-      #- ejabberd           # Unmaintained
-      #- elgg               # Unmaintained
       - gitea
       - jupyterhub
       - lokole
@@ -168,3 +157,21 @@
     quiet: yes
   when: item != 'nodejs' and item != 'postgresql' and item != 'mongodb' and item != 'yarn'    # Exclude auto-installed dependencies
   loop: "{{ vars_checklist }}"
+
+- name: 'DISALLOW "XYZ_install: True" if deprecated'
+  assert:
+    that: "{{ item }}_install is undefined or not {{ item }}_install"
+    fail_msg: "DISALLOWED: '{{ item }}_install: True' (e.g. in /etc/iiab/local_vars.yml)"
+    quiet: yes
+  with_items:
+    - dhcpd               # Deprecated
+    - named               # Deprecated
+    - wondershaper        # Deprecated
+    - dansguardian        # Deprecated
+    #- xo_services        # Unmaintained
+    #- activity_server    # Unmaintained
+    #- ejabberd_xs        # Unmaintained
+    #- idmgr              # Unmaintained
+    #- dokuwiki           # Unmaintained
+    #- ejabberd           # Unmaintained
+    #- elgg               # Unmaintained