Skip to content

Commit b5cd8ce

Browse files
committed
(MODULES-10899) Load php module with the right libphp file
1 parent 337e8b0 commit b5cd8ce

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

manifests/mod/php.pp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,10 @@
6767
$_lib = "librh-php${_php_version_no_dot}-php${_php_major}.so"
6868
} else {
6969
# Controls php version and libphp prefix
70-
$_lib = "${libphp_prefix}${php_version}.so"
70+
$_lib = $_php_major ? {
71+
'8' => "${libphp_prefix}.so",
72+
default => "${libphp_prefix}${php_version}.so",
73+
}
7174
}
7275
$_module_id = $_php_major ? {
7376
'5' => 'php5_module',

spec/classes/mod/php_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
it { is_expected.to contain_package('libapache2-mod-php8.0') }
7373
it {
7474
is_expected.to contain_file('php.load').with(
75-
content: "LoadModule php_module /usr/lib/apache2/modules/libphp8.0.so\n",
75+
content: "LoadModule php_module /usr/lib/apache2/modules/libphp.so\n",
7676
)
7777
}
7878
end

0 commit comments

Comments
 (0)