Merge pull request #432 from iiab/master

Sync from iiab:master

roles/0-init/tasks/validate_vars.yml

@@ -37,45 +37,54 @@
 # I want to perform input validation for Ansible playbooks"
 # https://stackoverflow.com/questions/46664127/how-do-i-fail-a-task-in-ansible-if-the-variable-contains-a-boolean-value-i-want/46667499#46667499
 
-# 2020-01-23: checks 53 + 53 + up-to-53 vars...for now...expect this to change!
-# Should we remove {xo_services, activity_server, ejabberd_xs, idmgr} as these
-# are officially now UNMAINTAINED in default_vars.yml and
-# https://github.com/iiab/iiab/blob/master/unmaintained-roles.txt etc?
+# 2020-01-23: Checks 53 + 53 + up-to-53 vars...for now...expect this to change!
+# 2020-09-26: Commented out 14 vars that are {mandatory, dependencies, or
+# unmaintained-for-years} for IIAB 7.2 release.  Keeping in mind that vars
+# will come and go as IIAB evolves, let's try to keep these 9 aligned:
+#
+# http://FAQ.IIAB.IO > "What services (IIAB apps) are suggested during installation?"
+# https://github.com/iiab/iiab/blob/master/vars/local_vars_min.yml
+# https://github.com/iiab/iiab/blob/master/vars/local_vars_medium.yml
+# https://github.com/iiab/iiab/blob/master/vars/local_vars_big.yml
+# https://github.com/iiab/iiab/blob/master/vars/default_vars.yml
+# https://github.com/iiab/iiab/blob/master/unmaintained-roles.txt
+# https://github.com/iiab/iiab/blob/master/roles/0-DEPRECATED-ROLES/
+# https://github.com/iiab/iiab/blob/master/tests/test.yml
+# https://github.com/iiab/iiab/blob/master/roles/0-init/tasks/validate_vars.yml
 
-- name: Set vars_checklist for 47 + 47 + up-to-47 vars ("XYZ_install" + "XYZ_enabled" + "XYZ_installed") to be checked
+- name: Set vars_checklist for 40 + 40 + up-to-40 vars ("XYZ_install" + "XYZ_enabled" + "XYZ_installed") to be checked
   set_fact:
     vars_checklist:
       - hostapd
       - dhcpd
       - named
       - dnsmasq
-      - captiveportal
       - bluetooth
-      - wondershaper
+      #- wondershaper       # Unmaintained
       - sshd
       - openvpn
-      - admin_console
+      - admin_console       # Coming soon
       #- nginx              # MANDATORY
-      #- apache    # Dependency installed on demand, by other apps/services
+      #- apache             # Dependency installed on demand by other apps/svcs
       #- mysql              # MANDATORY
       - squid
       - dansguardian
       - cups
       - samba
       - usb_lib
-      - xo_services
-      - activity_server
-      - ejabberd_xs
-      - idmgr
+      #- xo_services        # Unmaintained
+      #- activity_server    # Unmaintained
+      #- ejabberd_xs        # Unmaintained
+      #- idmgr              # Unmaintained
       - azuracast
-      - dokuwiki
-      - ejabberd
+      #- dokuwiki           # Unmaintained
+      #- ejabberd           # Unmaintained
       - elgg
       - gitea
       - lokole
       - mediawiki
       - mosquitto
-      #- nodejs    # Dependency installed on demand, by other apps/services
+      #- nodejs             # Dependency installed on demand by other apps/svcs
       - nodered
       - nextcloud
       - pbx
@@ -83,9 +92,9 @@
       - kalite
       - kolibri
       - kiwix
-      #- postgresql    # Dependency installed on demand, by other apps/services
+      #- postgresql         # Dependency installed on demand by other apps/svcs
       - moodle
-      #- mongodb    # Dependency installed on demand, by other apps/services
+      #- mongodb            # Dependency installed on demand by other apps/svcs
       - sugarizer
       - osm_vector_maps
       - transmission
@@ -94,8 +103,9 @@
       - munin
       - phpmyadmin
       - vnstat
-      #- yarn    # Dependency installed on demand, by other apps/services
+      #- yarn               # Dependency installed on demand by other apps/svcs
       - internetarchive
+      - captiveportal
       - minetest
       - calibre
       - calibreweb

roles/calibre-web/defaults/main.yml

@@ -14,7 +14,7 @@
 # All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml
 # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
 
-calibreweb_version: master    # WAS: master, 0.6.4, 0.6.5, 0.6.6, 0.6.7, 0.6.8
+calibreweb_version: 0.6.9    # WAS: master, 0.6.4, 0.6.5, 0.6.6, 0.6.7, 0.6.8
 
 calibreweb_venv_path: /usr/local/calibre-web-py3
 calibreweb_exec_path: "{{ calibreweb_venv_path }}/cps.py"

tests/test.yml

@@ -80,5 +80,14 @@
     - { role: yarn }
     #- { roles: xovis }
 
-# Let's try to keep the above list synchronized with:
+# Let's try to keep these 9 aligned:
+#
+# http://FAQ.IIAB.IO > "What services (IIAB apps) are suggested during installation?"
+# https://github.com/iiab/iiab/blob/master/vars/local_vars_min.yml
+# https://github.com/iiab/iiab/blob/master/vars/local_vars_medium.yml
+# https://github.com/iiab/iiab/blob/master/vars/local_vars_big.yml
+# https://github.com/iiab/iiab/blob/master/vars/default_vars.yml
 # https://github.com/iiab/iiab/blob/master/unmaintained-roles.txt
+# https://github.com/iiab/iiab/blob/master/roles/0-DEPRECATED-ROLES/
+# https://github.com/iiab/iiab/blob/master/tests/test.yml
+# https://github.com/iiab/iiab/blob/master/roles/0-init/tasks/validate_vars.yml

unmaintained-roles.txt

@@ -6,6 +6,8 @@ docker
 dokuwiki
 ejabberd
 ejabberd_xs
+homepage
+httpd-enable
 idmgr
 moodle-1.9
 nodogsplash