From af30ef562c8203ef371d085892d3d2e92df1b599 Mon Sep 17 00:00:00 2001
From: Chris Croome <chris@webarchitects.co.uk>
Date: Mon, 29 Apr 2024 22:56:15 +0100
Subject: [PATCH] fix typo and update defaults

---
 defaults/main.yml      | 174 ++++++++++++++++++++---------------------
 tasks/check_config.yml |   2 +-
 2 files changed, 88 insertions(+), 88 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 3bf8303..e371267 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -57,10 +57,10 @@ apache_conf_enabled:
   - other-vhosts-access-log
   - security
   - version-control
-apache_conf_disabled:
-  - mc3
-  - serve-cgi-bin
-  - webarch
+apache_conf_disabled: []
+  # - mc3
+  # - serve-cgi-bin
+  # - webarch
 apache_mods_enabled:
   - access_compat
   - alias
@@ -94,89 +94,89 @@ apache_mods_enabled:
   - socache_shmcb
   - ssl
   - status
-apache_mods_disabled:
-  - actions
-  - allowmethods
-  - asis
-  - auth_digest
-  - auth_form
-  - authn_anon
-  - authn_dbd
-  - authn_dbm
-  - authn_socache
-  - authnz_fcgi
-  - authnz_ldap
-  - authz_dbd
-  - authz_dbm
-  - authz_groupfile
-  - authz_owner
-  - brotli
-  - buffer
-  - cache_disk
-  - cache
-  - cache_socache
-  - cern_meta
-  - cgid
-  - cgi
-  - charset_lite
-  - data
-  - dav_fs
-  - dav
-  - dav_lock
-  - dbd
-  - dialup
-  - dump_io
-  - echo
-  - ext_filter
-  - fcgid
-  - file_cache
-  - heartbeat
-  - heartmonitor
-  - ident
-  - imagemap
-  - info
-  - lbmethod_bybusyness
-  - lbmethod_byrequests
-  - lbmethod_bytraffic
-  - lbmethod_heartbeat
-  - ldap
-  - log_debug
-  - log_forensic
-  - lua
-  - macro
-  - md
-  - mime_magic
-  - mpm_worker
-  - proxy_ajp
-  - proxy_balancer
-  - proxy_connect
-  - proxy_express
-  - proxy_fdpass
-  - proxy_ftp
-  - proxy_hcheck
-  - proxy_html
-  - proxy_scgi
-  - proxy_uwsgi
-  - ratelimit
-  - reflector
-  - request
-  - sed
-  - session_cookie
-  - session_crypto
-  - session_dbd
-  - session
-  - slotmem_plain
-  - slotmem_shm
-  - socache_dbm
-  - socache_memcache
-  - speling
-  - substitute
-  - suexec
-  - unique_id
-  - userdir
-  - usertrack
-  - vhost_alias
-  - xml2enc
+apache_mods_disabled: []
+  # - actions
+  # - allowmethods
+  # - asis
+  # - auth_digest
+  # - auth_form
+  # - authn_anon
+  # - authn_dbd
+  # - authn_dbm
+  # - authn_socache
+  # - authnz_fcgi
+  # - authnz_ldap
+  # - authz_dbd
+  # - authz_dbm
+  # - authz_groupfile
+  # - authz_owner
+  # - brotli
+  # - buffer
+  # - cache_disk
+  # - cache
+  # - cache_socache
+  # - cern_meta
+  # - cgid
+  # - cgi
+  # - charset_lite
+  # - data
+  # - dav_fs
+  # - dav
+  # - dav_lock
+  # - dbd
+  # - dialup
+  # - dump_io
+  # - echo
+  # - ext_filter
+  # - fcgid
+  # - file_cache
+  # - heartbeat
+  # - heartmonitor
+  # - ident
+  # - imagemap
+  # - info
+  # - lbmethod_bybusyness
+  # - lbmethod_byrequests
+  # - lbmethod_bytraffic
+  # - lbmethod_heartbeat
+  # - ldap
+  # - log_debug
+  # - log_forensic
+  # - lua
+  # - macro
+  # - md
+  # - mime_magic
+  # - mpm_worker
+  # - proxy_ajp
+  # - proxy_balancer
+  # - proxy_connect
+  # - proxy_express
+  # - proxy_fdpass
+  # - proxy_ftp
+  # - proxy_hcheck
+  # - proxy_html
+  # - proxy_scgi
+  # - proxy_uwsgi
+  # - ratelimit
+  # - reflector
+  # - request
+  # - sed
+  # - session_cookie
+  # - session_crypto
+  # - session_dbd
+  # - session
+  # - slotmem_plain
+  # - slotmem_shm
+  # - socache_dbm
+  # - socache_memcache
+  # - speling
+  # - substitute
+  # - suexec
+  # - unique_id
+  # - userdir
+  # - usertrack
+  # - vhost_alias
+  # - xml2enc
 # See this issue https://github.com/icing/mod_md/issues/260
 apache_md_private_keys:
   - rsa3072
diff --git a/tasks/check_config.yml b/tasks/check_config.yml
index 8bf2c62..a5e9d15 100644
--- a/tasks/check_config.yml
+++ b/tasks/check_config.yml
@@ -81,7 +81,7 @@
       ansible.builtin.assert:
         that:
           - apache_sites_enabled | difference(apache_sites_available) | length == 0
-        fail_msg: "The following sites that are set to be enabled are not available:{% for apache_sites in apache_sites_enabled | difference(apache_sites_available) %} {{ apache_stes }}{% endfor %}"
+        fail_msg: "The following sites that are set to be enabled are not available:{% for apache_sites in apache_sites_enabled | difference(apache_sites_available) %} {{ apache_sites }}{% endfor %}"
 
   tags:
     - apache
-- 
GitLab