From 24285ca7b2d50f041b2df188663bf70af1efb538 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 8 Aug 2021 09:12:54 -0400 Subject: [PATCH] Update validate_vars.yml + Prune local_vars files etc --- roles/0-init/tasks/validate_vars.yml | 12 +++++----- roles/6-generic-apps/tasks/main.yml | 1 - tests/test.yml | 2 +- unmaintained-roles.txt | 1 + vars/local_vars_big.yml | 22 ------------------- vars/local_vars_medium.yml | 22 ------------------- vars/local_vars_min.yml | 22 ------------------- ...rs_olpc.yml => local_vars_olpc.yml.unused} | 0 8 files changed, 8 insertions(+), 74 deletions(-) rename vars/{local_vars_olpc.yml => local_vars_olpc.yml.unused} (100%) diff --git a/roles/0-init/tasks/validate_vars.yml b/roles/0-init/tasks/validate_vars.yml index b10e1678d..44f20da20 100644 --- a/roles/0-init/tasks/validate_vars.yml +++ b/roles/0-init/tasks/validate_vars.yml @@ -63,7 +63,7 @@ # # 2020-11-04: Fix validation of 5 [now 4] core dependencies, for ./runrole etc -- name: Set vars_checklist for 45 + 45 + 41 vars ("XYZ_install" + "XYZ_enabled" + "XYZ_installed") to be checked +- name: Set vars_checklist for 44 + 44 + 40 vars ("XYZ_install" + "XYZ_enabled" + "XYZ_installed") to be checked set_fact: vars_checklist: - hostapd @@ -76,7 +76,7 @@ - openvpn - admin_console #- nginx # MANDATORY - ###- apache ### Dependency - excluded from _installed check below + #- apache # Unmaintained - former dependency #- mysql # MANDATORY - squid - dansguardian @@ -90,7 +90,7 @@ - azuracast #- dokuwiki # Unmaintained #- ejabberd # Unmaintained - - elgg + #- elgg # Unmaintained - gitea - jupyterhub - lokole @@ -99,7 +99,6 @@ - nodejs # Dependency - excluded from _installed check below - nodered - nextcloud - - pbx - wordpress - kalite - kolibri @@ -116,11 +115,12 @@ - phpmyadmin - vnstat - yarn # Dependency - excluded from _installed check below - - internetarchive - captiveportal + - internetarchive - minetest - - calibre - calibreweb + - calibre + - pbx - name: Assert that {{ vars_checklist | length }} "XYZ_install" vars are all... defined assert: diff --git a/roles/6-generic-apps/tasks/main.yml b/roles/6-generic-apps/tasks/main.yml index d25999ad7..f241095f6 100644 --- a/roles/6-generic-apps/tasks/main.yml +++ b/roles/6-generic-apps/tasks/main.yml @@ -3,7 +3,6 @@ - name: ...IS BEGINNING ==================================== meta: noop -# UNMAINTAINED - name: AZURACAST include_role: name: azuracast diff --git a/tests/test.yml b/tests/test.yml index 5d99a34e1..7160b247c 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -28,7 +28,7 @@ #- { role: dokuwiki } #- { role: ejabberd } #- { role: ejabberd_xs } - - { role: elgg } + #- { role: elgg } - { role: firmware } - { role: gitea } #- { role: homepage } diff --git a/unmaintained-roles.txt b/unmaintained-roles.txt index 9174375a4..c30178fbc 100644 --- a/unmaintained-roles.txt +++ b/unmaintained-roles.txt @@ -6,6 +6,7 @@ docker dokuwiki ejabberd ejabberd_xs +elgg homepage httpd httpd-enable diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index ff295308a..fd7d66e3c 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -199,34 +199,12 @@ usb_lib_umask0000_for_kolibri: True # Lesser-supported XO services need additional testing. Please contact # http://lists.laptop.org/pipermail/server-devel/ if you're able to help test. -# UNMAINTAINED -# xo_services_install: False -# xo_services_enabled: False - -# UNMAINTAINED -# activity_server_install: False -# activity_server_enabled: False - -# UNMAINTAINED -# Please instead consider 'ejabberd' in Stage 6-GENERIC-APPS below -# ejabberd_xs_install: False -# ejabberd_xs_enabled: False - -# UNMAINTAINED -# Change calibre_port from 8080 to 8010 below, if you enable idmgr -# idmgr_install: False -# idmgr_enabled: False - # 6-GENERIC-APPS azuracast_install: False azuracast_enabled: False # This var is currently IGNORED. -# UNMAINTAINED as of July 2021 -elgg_install: False -elgg_enabled: False - # Gitea (lightweight self-hosted "GitHub") from https://gitea.io gitea_install: True gitea_enabled: True diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index 3c62bf7d2..253468a51 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -199,34 +199,12 @@ usb_lib_umask0000_for_kolibri: True # Lesser-supported XO services need additional testing. Please contact # http://lists.laptop.org/pipermail/server-devel/ if you're able to help test. -# UNMAINTAINED -# xo_services_install: False -# xo_services_enabled: False - -# UNMAINTAINED -# activity_server_install: False -# activity_server_enabled: False - -# UNMAINTAINED -# Please instead consider 'ejabberd' in Stage 6-GENERIC-APPS below -# ejabberd_xs_install: False -# ejabberd_xs_enabled: False - -# UNMAINTAINED -# Change calibre_port from 8080 to 8010 below, if you enable idmgr -# idmgr_install: False -# idmgr_enabled: False - # 6-GENERIC-APPS azuracast_install: False azuracast_enabled: False # This var is currently IGNORED. -# UNMAINTAINED as of July 2021 -elgg_install: False -elgg_enabled: False - # Gitea (lightweight self-hosted "GitHub") from https://gitea.io gitea_install: False gitea_enabled: False diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index 3897442e7..4b5e6874d 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -199,34 +199,12 @@ usb_lib_umask0000_for_kolibri: True # Lesser-supported XO services need additional testing. Please contact # http://lists.laptop.org/pipermail/server-devel/ if you're able to help test. -# UNMAINTAINED -# xo_services_install: False -# xo_services_enabled: False - -# UNMAINTAINED -# activity_server_install: False -# activity_server_enabled: False - -# UNMAINTAINED -# Please instead consider 'ejabberd' in Stage 6-GENERIC-APPS below -# ejabberd_xs_install: False -# ejabberd_xs_enabled: False - -# UNMAINTAINED -# Change calibre_port from 8080 to 8010 below, if you enable idmgr -# idmgr_install: False -# idmgr_enabled: False - # 6-GENERIC-APPS azuracast_install: False azuracast_enabled: False # This var is currently IGNORED. -# UNMAINTAINED as of July 2021 -elgg_install: False -elgg_enabled: False - # Gitea (lightweight self-hosted "GitHub") from https://gitea.io gitea_install: False gitea_enabled: False diff --git a/vars/local_vars_olpc.yml b/vars/local_vars_olpc.yml.unused similarity index 100% rename from vars/local_vars_olpc.yml rename to vars/local_vars_olpc.yml.unused