From 6304219e61215946937d89827b19f5333cd2c255 Mon Sep 17 00:00:00 2001
From: Christian Castelli <34291598+cdamage@users.noreply.github.com>
Date: Fri, 5 Feb 2021 15:23:14 -0600
Subject: [PATCH] Fix issues when using php8

PHP8 dropped the conventions of including the major versions in apache modules. This fix makes it so that moving forward the module will no longer add the major in the relevant places.

before change:
/etc/httpd/conf.modules.d/php8.conf
/etc/httpd/conf.modules.d/php8.load
^---Content---^
LoadModule php8_module modules/libphp8.so

Apache won't load

After change:
/etc/httpd/conf.modules.d/php.conf
/etc/httpd/conf.modules.d/php.load
^---Content---^
LoadModule php_module modules/libphp.so
---
 manifests/mod/php.pp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
index 7b320d0066..b8b1449d93 100644
--- a/manifests/mod/php.pp
+++ b/manifests/mod/php.pp
@@ -17,7 +17,11 @@
   $libphp_prefix    = 'libphp'
 ) inherits apache::params {
   include apache
-  $mod = "php${php_version}"
+  if $php_version <= '7' {
+    $mod = "php${php_version}"
+  } else {
+    $mod = "php"
+  }
 
   if $apache::version::scl_httpd_version == undef and $apache::version::scl_php_version != undef {
     fail('If you define apache::version::scl_php_version, you also need to specify apache::version::scl_httpd_version')
@@ -75,7 +79,7 @@
       id             => "php${_php_major}_module",
       path           => "${apache::lib_path}/mod_${mod}.so",
     }
-  } else {
+  } elsif $php_version <= '7' {
     ::apache::mod { $mod:
       package        => $_package_name,
       package_ensure => $package_ensure,
@@ -83,6 +87,14 @@
       id             => "php${_php_major}_module",
       path           => $path,
     }
+  } else {
+    ::apache::mod { $mod:
+        package        => $_package_name,
+        package_ensure => $package_ensure,
+        lib            => "${libphp_prefix}.so",
+        id             => "php_module",
+        path           => $path,
+    }
   }
 
   include apache::mod::mime