Merge pull request #2166 from sheenaajay/MODULES-10899

(MODULES-10899) Load php module with the right libphp file
puppetlabs · Jul 16, 2021 · f50950a · f50950a
2 parents 337e8b0 + b5cd8ce
commit f50950a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
@@ -67,7 +67,10 @@
     $_lib = "librh-php${_php_version_no_dot}-php${_php_major}.so"
   } else {
     # Controls php version and libphp prefix
-    $_lib = "${libphp_prefix}${php_version}.so"
+    $_lib = $_php_major ? {
+      '8'     => "${libphp_prefix}.so",
+      default => "${libphp_prefix}${php_version}.so",
+    }
   }
   $_module_id = $_php_major ? {
     '5'     => 'php5_module',

diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
@@ -72,7 +72,7 @@
               it { is_expected.to contain_package('libapache2-mod-php8.0') }
               it {
                 is_expected.to contain_file('php.load').with(
-                  content: "LoadModule php_module /usr/lib/apache2/modules/libphp8.0.so\n",
+                  content: "LoadModule php_module /usr/lib/apache2/modules/libphp.so\n",
                 )
               }
             end