From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Wed, 8 May 2024 20:12:30 +0000 (-0600)
Subject: Always use the Apache2 cgid module.
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=54dc48e0ad2bf5e562a663831703796c835cb772;p=Institute

Always use the Apache2 cgid module.

Core (Nextcloud) and Front presumably benefit.  Lost the why of
supporting cgi as well.  Perhaps cgi was recommended with a default
MPM?
---

diff --git a/README.org b/README.org
index b19a5d8..add74cd 100644
--- a/README.org
+++ b/README.org
@@ -3491,22 +3491,11 @@ The tasks below install Apache2 and edit its default configuration.
   apt: pkg=apache2
 
 - name: Enable Apache2 modules.
-  become: yes
-  apache2_module:
-    name: "{{ item }}"
-  loop: [ userdir, cgi ]
-  notify: Restart Apache2.
-  when: ansible_distribution != 'Debian'
-        or 12 > ansible_distribution_major_version|int
-
-- name: Enable Apache2 modules (Debian 12).
   become: yes
   apache2_module:
     name: "{{ item }}"
   loop: [ userdir, cgid ]
   notify: Restart Apache2.
-  when: ansible_distribution == 'Debian'
-        and 11 < ansible_distribution_major_version|int
 #+END_SRC
 
 With Apache installed there is a =/etc/apache/sites-available/=
diff --git a/roles_t/core/tasks/main.yml b/roles_t/core/tasks/main.yml
index 5a8d0bf..d6fd38c 100644
--- a/roles_t/core/tasks/main.yml
+++ b/roles_t/core/tasks/main.yml
@@ -450,22 +450,11 @@
   apt: pkg=apache2
 
 - name: Enable Apache2 modules.
-  become: yes
-  apache2_module:
-    name: "{{ item }}"
-  loop: [ userdir, cgi ]
-  notify: Restart Apache2.
-  when: ansible_distribution != 'Debian'
-        or 12 > ansible_distribution_major_version|int
-
-- name: Enable Apache2 modules (Debian 12).
   become: yes
   apache2_module:
     name: "{{ item }}"
   loop: [ userdir, cgid ]
   notify: Restart Apache2.
-  when: ansible_distribution == 'Debian'
-        and 11 < ansible_distribution_major_version|int
 
 - name: Install live web site.
   become: yes