From 8f9ee9ea57cd1b53c6e90addc730044c208d85df Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 26 Sep 2020 13:11:33 -0400 Subject: [PATCH 1/9] Update validate_vars.yml --- roles/0-init/tasks/validate_vars.yml | 35 +++++++++++++++++----------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/roles/0-init/tasks/validate_vars.yml b/roles/0-init/tasks/validate_vars.yml index bdcd15ea9..fb056b473 100644 --- a/roles/0-init/tasks/validate_vars.yml +++ b/roles/0-init/tasks/validate_vars.yml @@ -37,24 +37,30 @@ # 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 13 vars that are {mandatory, dependencies, or +# unmaintained-for-years} for IIAB 7.2 release. Keep in mind that vars will +# come and go as IIAB evolves, so here are 6 important places to try to align: +# +# https://github.com/iiab/iiab/blob/master/unmaintained-roles.txt +# https://github.com/iiab/iiab/blob/master/tests/test.yml +# https://github.com/iiab/iiab/blob/master/vars/default_vars.yml +# 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 -- 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 # Umaintained - sshd - openvpn - - admin_console + - admin_console # Coming soon #- nginx # MANDATORY #- apache # Dependency installed on demand, by other apps/services #- mysql # MANDATORY @@ -63,13 +69,13 @@ - cups - samba - usb_lib - - xo_services - - activity_server - - ejabberd_xs - - idmgr + #- xo_services # Umaintained + #- activity_server # Umaintained + #- ejabberd_xs # Umaintained + #- idmgr # Umaintained - azuracast - - dokuwiki - - ejabberd + #- dokuwiki # Umaintained + #- ejabberd # Umaintained - elgg - gitea - lokole @@ -96,6 +102,7 @@ - vnstat #- yarn # Dependency installed on demand, by other apps/services - internetarchive + - captiveportal - minetest - calibre - calibreweb From 0277a0bece88419cd431c66121384d46ee37e419 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 26 Sep 2020 13:24:39 -0400 Subject: [PATCH 2/9] Update unmaintained-roles.txt --- unmaintained-roles.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/unmaintained-roles.txt b/unmaintained-roles.txt index f04b87c9e..bb6253dd3 100644 --- a/unmaintained-roles.txt +++ b/unmaintained-roles.txt @@ -6,6 +6,8 @@ docker dokuwiki ejabberd ejabberd_xs +homepage +httpd-enable idmgr moodle-1.9 nodogsplash From 2cafbdf75415584155ae0d39077f1e0c0e93ac42 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 26 Sep 2020 13:33:34 -0400 Subject: [PATCH 3/9] Better explanation at the bottom of tests/test.yml --- tests/test.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/test.yml b/tests/test.yml index 76e7ce540..afa17c5bb 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -80,5 +80,12 @@ - { role: yarn } #- { roles: xovis } -# Let's try to keep the above list synchronized with: +# Let's try to keep these 7 aligned: +# # https://github.com/iiab/iiab/blob/master/unmaintained-roles.txt +# https://github.com/iiab/iiab/blob/master/tests/test.yml +# https://github.com/iiab/iiab/blob/master/roles/0-init/tasks/validate_vars.yml +# https://github.com/iiab/iiab/blob/master/vars/default_vars.yml +# 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 From fd0b1e8d7970b5a7df037a0b4cb293030872d2a3 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 26 Sep 2020 13:33:41 -0400 Subject: [PATCH 4/9] Update validate_vars.yml --- roles/0-init/tasks/validate_vars.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/roles/0-init/tasks/validate_vars.yml b/roles/0-init/tasks/validate_vars.yml index fb056b473..354c2655e 100644 --- a/roles/0-init/tasks/validate_vars.yml +++ b/roles/0-init/tasks/validate_vars.yml @@ -38,12 +38,13 @@ # 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! -# 2020-09-26: Commented out 13 vars that are {mandatory, dependencies, or -# unmaintained-for-years} for IIAB 7.2 release. Keep in mind that vars will -# come and go as IIAB evolves, so here are 6 important places to try to align: +# 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 7 aligned: # # https://github.com/iiab/iiab/blob/master/unmaintained-roles.txt # https://github.com/iiab/iiab/blob/master/tests/test.yml +# https://github.com/iiab/iiab/blob/master/roles/0-init/tasks/validate_vars.yml # https://github.com/iiab/iiab/blob/master/vars/default_vars.yml # https://github.com/iiab/iiab/blob/master/vars/local_vars_min.yml # https://github.com/iiab/iiab/blob/master/vars/local_vars_medium.yml From 93c480a0eb98cf06e9f0ed33c7ee6c8ac53357c8 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 26 Sep 2020 13:45:36 -0400 Subject: [PATCH 5/9] Clean indentation: 0-init/tasks/validate_vars.yml --- roles/0-init/tasks/validate_vars.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/roles/0-init/tasks/validate_vars.yml b/roles/0-init/tasks/validate_vars.yml index 354c2655e..41ddc74ba 100644 --- a/roles/0-init/tasks/validate_vars.yml +++ b/roles/0-init/tasks/validate_vars.yml @@ -58,13 +58,13 @@ - named - dnsmasq - bluetooth - #- wondershaper # Umaintained + #- wondershaper # Umaintained - sshd - openvpn - - admin_console # Coming soon - #- nginx # MANDATORY - #- apache # Dependency installed on demand, by other apps/services - #- mysql # MANDATORY + - admin_console # Coming soon + #- nginx # MANDATORY + #- apache # Dependency installed on demand by other apps/svcs + #- mysql # MANDATORY - squid - dansguardian - cups @@ -75,14 +75,14 @@ #- ejabberd_xs # Umaintained #- idmgr # Umaintained - azuracast - #- dokuwiki # Umaintained - #- ejabberd # Umaintained + #- dokuwiki # Umaintained + #- ejabberd # Umaintained - 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 @@ -90,9 +90,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 @@ -101,7 +101,7 @@ - munin - phpmyadmin - vnstat - #- yarn # Dependency installed on demand, by other apps/services + #- yarn # Dependency installed on demand by other apps/svcs - internetarchive - captiveportal - minetest From 258ebeb5d46e9aebcee04cbd52b8c8d278adaab0 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 26 Sep 2020 14:09:18 -0400 Subject: [PATCH 6/9] Update validate_vars.yml --- roles/0-init/tasks/validate_vars.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/roles/0-init/tasks/validate_vars.yml b/roles/0-init/tasks/validate_vars.yml index 41ddc74ba..99ec838dd 100644 --- a/roles/0-init/tasks/validate_vars.yml +++ b/roles/0-init/tasks/validate_vars.yml @@ -40,15 +40,17 @@ # 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 7 aligned: +# will come and go as IIAB evolves, let's try to keep these 9 aligned: # -# https://github.com/iiab/iiab/blob/master/unmaintained-roles.txt -# https://github.com/iiab/iiab/blob/master/tests/test.yml -# https://github.com/iiab/iiab/blob/master/roles/0-init/tasks/validate_vars.yml -# https://github.com/iiab/iiab/blob/master/vars/default_vars.yml +# 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 40 + 40 + up-to-40 vars ("XYZ_install" + "XYZ_enabled" + "XYZ_installed") to be checked set_fact: From 8b631456a83f0df6fcb994cf721d745f58271c90 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 26 Sep 2020 14:11:57 -0400 Subject: [PATCH 7/9] More complete doc in tests/test.yml too --- tests/test.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/test.yml b/tests/test.yml index afa17c5bb..b429180f7 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -80,12 +80,14 @@ - { role: yarn } #- { roles: xovis } -# Let's try to keep these 7 aligned: +# Let's try to keep these 9 aligned: # -# https://github.com/iiab/iiab/blob/master/unmaintained-roles.txt -# https://github.com/iiab/iiab/blob/master/tests/test.yml -# https://github.com/iiab/iiab/blob/master/roles/0-init/tasks/validate_vars.yml -# https://github.com/iiab/iiab/blob/master/vars/default_vars.yml +# 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 From 4ed0fcf7065e8638ac85e107a85c3d053ef0fc36 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 26 Sep 2020 14:16:49 -0400 Subject: [PATCH 8/9] Typos fixed in validate_vars.yml --- roles/0-init/tasks/validate_vars.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/roles/0-init/tasks/validate_vars.yml b/roles/0-init/tasks/validate_vars.yml index 99ec838dd..dac8ea944 100644 --- a/roles/0-init/tasks/validate_vars.yml +++ b/roles/0-init/tasks/validate_vars.yml @@ -60,7 +60,7 @@ - named - dnsmasq - bluetooth - #- wondershaper # Umaintained + #- wondershaper # Unmaintained - sshd - openvpn - admin_console # Coming soon @@ -72,13 +72,13 @@ - cups - samba - usb_lib - #- xo_services # Umaintained - #- activity_server # Umaintained - #- ejabberd_xs # Umaintained - #- idmgr # Umaintained + #- xo_services # Unmaintained + #- activity_server # Unmaintained + #- ejabberd_xs # Unmaintained + #- idmgr # Unmaintained - azuracast - #- dokuwiki # Umaintained - #- ejabberd # Umaintained + #- dokuwiki # Unmaintained + #- ejabberd # Unmaintained - elgg - gitea - lokole From a104470314f2bea616aeaf491de7f431d9cf21de Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 27 Sep 2020 07:47:47 -0400 Subject: [PATCH 9/9] Calibre-Web master -> 0.6.9 for IIAB 7.2 release --- roles/calibre-web/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/calibre-web/defaults/main.yml b/roles/calibre-web/defaults/main.yml index a9d134696..a57ecfcc7 100644 --- a/roles/calibre-web/defaults/main.yml +++ b/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"