From 2e067307578fb3c0ce468a3d933e21badd298f87 Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Wed, 8 May 2024 14:24:01 -0600 Subject: [PATCH] Always use the Apache2 cgid module. Following institute practice (which see, commit 54dc48e). --- README.org | 11 ++--------- roles_t/abbey-core/tasks/main.yml | 9 +-------- roles_t/abbey-dvr/tasks/main.yml | 2 +- roles_t/abbey-front/tasks/main.yml | 9 +-------- 4 files changed, 5 insertions(+), 26 deletions(-) diff --git a/README.org b/README.org index 74aa21c..b02b546 100644 --- a/README.org +++ b/README.org @@ -329,16 +329,9 @@ web site =/favicon.ico=. apache2_module: name=rewrite notify: Restart Apache2. -- name: Enable Apache2 cgid module for Gitweb (Ubuntu). +- name: Enable Apache2 cgid module. become: yes apache2_module: name=cgid - when: ansible_distribution == 'Ubuntu' - notify: Restart Apache2. - -- name: Enable Apache2 cgi module for Gitweb (Debian). - become: yes - apache2_module: name=cgi - when: ansible_distribution == 'Debian' notify: Restart Apache2. - name: Install libcgi-pm-perl for Gitweb. @@ -2077,7 +2070,7 @@ and "Time Zone" in =/usr/share/doc/zoneminder/README.Debian.gz=. become: yes apache2_module: name: "{{ item }}" - loop: [ cgi, rewrite, expires, headers ] + loop: [ cgid, rewrite, expires, headers ] notify: Restart Apache2. - name: Enable Zoneminder Apache configuration. diff --git a/roles_t/abbey-core/tasks/main.yml b/roles_t/abbey-core/tasks/main.yml index 1778f09..802a987 100644 --- a/roles_t/abbey-core/tasks/main.yml +++ b/roles_t/abbey-core/tasks/main.yml @@ -120,16 +120,9 @@ apache2_module: name=rewrite notify: Restart Apache2. -- name: Enable Apache2 cgid module for Gitweb (Ubuntu). +- name: Enable Apache2 cgid module. become: yes apache2_module: name=cgid - when: ansible_distribution == 'Ubuntu' - notify: Restart Apache2. - -- name: Enable Apache2 cgi module for Gitweb (Debian). - become: yes - apache2_module: name=cgi - when: ansible_distribution == 'Debian' notify: Restart Apache2. - name: Install libcgi-pm-perl for Gitweb. diff --git a/roles_t/abbey-dvr/tasks/main.yml b/roles_t/abbey-dvr/tasks/main.yml index 3bf4614..f167f17 100644 --- a/roles_t/abbey-dvr/tasks/main.yml +++ b/roles_t/abbey-dvr/tasks/main.yml @@ -10,7 +10,7 @@ become: yes apache2_module: name: "{{ item }}" - loop: [ cgi, rewrite, expires, headers ] + loop: [ cgid, rewrite, expires, headers ] notify: Restart Apache2. - name: Enable Zoneminder Apache configuration. diff --git a/roles_t/abbey-front/tasks/main.yml b/roles_t/abbey-front/tasks/main.yml index 878e3e4..aaeae03 100644 --- a/roles_t/abbey-front/tasks/main.yml +++ b/roles_t/abbey-front/tasks/main.yml @@ -88,16 +88,9 @@ apache2_module: name=rewrite notify: Restart Apache2. -- name: Enable Apache2 cgid module for Gitweb (Ubuntu). +- name: Enable Apache2 cgid module. become: yes apache2_module: name=cgid - when: ansible_distribution == 'Ubuntu' - notify: Restart Apache2. - -- name: Enable Apache2 cgi module for Gitweb (Debian). - become: yes - apache2_module: name=cgi - when: ansible_distribution == 'Debian' notify: Restart Apache2. - name: Install libcgi-pm-perl for Gitweb. -- 2.25.1