Skip to content

Commit 925cd89

Browse files
authored
Merge pull request #2572 from puppetlabs/CAT-2100-add-debian-12-support
(CAT-2100) Add Debian 12 support
2 parents d50585c + 19c0e9d commit 925cd89

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

metadata.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@
4949
"operatingsystem": "Debian",
5050
"operatingsystemrelease": [
5151
"10",
52-
"11"
52+
"11",
53+
"12"
5354
]
5455
},
5556
{

spec/acceptance/mod_php_spec.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ class { 'apache::mod::php': }
2020
content => "<?php phpinfo(); ?>\\n",
2121
}
2222
MANIFEST
23+
2324
it 'succeeds in puppeting php' do
2425
apply_manifest(pp, catch_failures: true)
2526
end
@@ -36,7 +37,7 @@ class { 'apache::mod::php': }
3637
describe file("#{apache_hash['mod_dir']}/php7.4.conf") do
3738
it { is_expected.to contain 'DirectoryIndex index.php' }
3839
end
39-
elsif os[:family] == 'debian' && os[:release] =~ %r{^12\.}
40+
elsif os[:family] == 'debian' && os[:release] =~ %r{^12}
4041
describe file("#{apache_hash['mod_dir']}/php8.2.conf") do
4142
it { is_expected.to contain 'DirectoryIndex index.php' }
4243
end

spec/classes/mod/php_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191

9292
it {
9393
expect(subject).to contain_file('php8.2.load').with(
94-
content: "LoadModule php8_module /usr/lib/apache2/modules/libphp8.2.so\n",
94+
content: "LoadModule php_module /usr/lib/apache2/modules/libphp8.2.so\n",
9595
)
9696
}
9797
end

0 commit comments

Comments
 (0)