From 593bf7c8fcf423e58c1dd0eebc1f11722d69ccc9 Mon Sep 17 00:00:00 2001 From: simonLeary42 <71396965+simonLeary42@users.noreply.github.com> Date: Mon, 31 Mar 2025 16:50:44 -0400 Subject: [PATCH 1/5] update php apache module workaround --- plugins/modules/apache2_module.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/modules/apache2_module.py b/plugins/modules/apache2_module.py index cacb870ee0..3a5d528c7f 100644 --- a/plugins/modules/apache2_module.py +++ b/plugins/modules/apache2_module.py @@ -194,7 +194,7 @@ def create_apache_identifier(name): # re expressions to extract subparts of names re_workarounds = [ - ('php', re.compile(r'^(php\d)\.')), + ('php', re.compile(r'^(php)[\d\.]+')), ] for a2enmod_spelling, module_name in text_workarounds: From 287611e7a25ae544b2cdda03c5c2947f52ebafc2 Mon Sep 17 00:00:00 2001 From: simonLeary42 <71396965+simonLeary42@users.noreply.github.com> Date: Mon, 31 Mar 2025 17:08:04 -0400 Subject: [PATCH 2/5] Update apache2_module.py --- plugins/modules/apache2_module.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/modules/apache2_module.py b/plugins/modules/apache2_module.py index 3a5d528c7f..afedd0163a 100644 --- a/plugins/modules/apache2_module.py +++ b/plugins/modules/apache2_module.py @@ -194,7 +194,8 @@ def create_apache_identifier(name): # re expressions to extract subparts of names re_workarounds = [ - ('php', re.compile(r'^(php)[\d\.]+')), + ('php7', re.compile(r'^(php7)[\d\.]+')), + ('php8', re.compile(r'^(php)[\d\.]+')), ] for a2enmod_spelling, module_name in text_workarounds: From 8bb08854bf4cba6e99c452950e9ad7f965dbdadb Mon Sep 17 00:00:00 2001 From: simonLeary42 <71396965+simonLeary42@users.noreply.github.com> Date: Mon, 31 Mar 2025 17:09:57 -0400 Subject: [PATCH 3/5] Update apache2_module.py --- plugins/modules/apache2_module.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/modules/apache2_module.py b/plugins/modules/apache2_module.py index afedd0163a..fd2152f6ba 100644 --- a/plugins/modules/apache2_module.py +++ b/plugins/modules/apache2_module.py @@ -194,7 +194,7 @@ def create_apache_identifier(name): # re expressions to extract subparts of names re_workarounds = [ - ('php7', re.compile(r'^(php7)[\d\.]+')), + ('php', re.compile(r'^(php\d)\.')), ('php8', re.compile(r'^(php)[\d\.]+')), ] From a5e0ad537d27db252b874082d5bff582849d82b8 Mon Sep 17 00:00:00 2001 From: simonLeary42 <71396965+simonLeary42@users.noreply.github.com> Date: Mon, 31 Mar 2025 17:12:13 -0400 Subject: [PATCH 4/5] Update apache2_module.py --- plugins/modules/apache2_module.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/modules/apache2_module.py b/plugins/modules/apache2_module.py index fd2152f6ba..2007b5d1f1 100644 --- a/plugins/modules/apache2_module.py +++ b/plugins/modules/apache2_module.py @@ -194,8 +194,8 @@ def create_apache_identifier(name): # re expressions to extract subparts of names re_workarounds = [ - ('php', re.compile(r'^(php\d)\.')), ('php8', re.compile(r'^(php)[\d\.]+')), + ('php', re.compile(r'^(php\d)\.')), ] for a2enmod_spelling, module_name in text_workarounds: From 4be644dae0e0cc964679dadd6ddafb7e972199ee Mon Sep 17 00:00:00 2001 From: Simon Leary Date: Mon, 31 Mar 2025 17:22:36 -0400 Subject: [PATCH 5/5] add changelog fragment --- changelogs/fragments/9951-mod-php-identifier.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 changelogs/fragments/9951-mod-php-identifier.yml diff --git a/changelogs/fragments/9951-mod-php-identifier.yml b/changelogs/fragments/9951-mod-php-identifier.yml new file mode 100644 index 0000000000..b75f507193 --- /dev/null +++ b/changelogs/fragments/9951-mod-php-identifier.yml @@ -0,0 +1,2 @@ +minor_changes: + - apache2_module - added workaround for new php module name (php7_module -> php_module)