Skip to content

Commit 6588929

Browse files
authored
Merge pull request #2439 from Robnarok/main
feat: add Debian12 Compability
2 parents ac1b7b4 + c8ab038 commit 6588929

File tree

4 files changed

+18
-1
lines changed

4 files changed

+18
-1
lines changed

manifests/params.pp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,7 @@
378378
'9' => '7.0', # Debian Stretch
379379
'10' => '7.3', # Debian Buster
380380
'11' => '7.4', # Debian Bullseye
381+
'12' => '8.2', # Debian Bookworm
381382
'20.04' => '7.4', # Ubuntu Foccal Fossal
382383
'22.04' => '8.1', # Ubuntu Jammy
383384
default => '7.2', # Ubuntu Bionic, Cosmic and Disco

metadata.json

Lines changed: 2 additions & 1 deletion
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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ class { 'apache::mod::php': }
3636
describe file("#{apache_hash['mod_dir']}/php7.4.conf") do
3737
it { is_expected.to contain 'DirectoryIndex index.php' }
3838
end
39+
elsif os[:family] == 'debian' && os[:release] =~ %r{^12\.}
40+
describe file("#{apache_hash['mod_dir']}/php8.2.conf") do
41+
it { is_expected.to contain 'DirectoryIndex index.php' }
42+
end
3943
elsif os[:family] == 'ubuntu' && os[:release] == '18.04'
4044
describe file("#{apache_hash['mod_dir']}/php7.2.conf") do
4145
it { is_expected.to contain 'DirectoryIndex index.php' }

spec/classes/mod/php_spec.rb

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,17 @@
8484
}
8585
end
8686
end
87+
when '12'
88+
context 'on bookworm' do
89+
it { is_expected.to contain_apache__mod('php8.2') }
90+
it { is_expected.to contain_package('libapache2-mod-php8.2') }
91+
92+
it {
93+
expect(subject).to contain_file('php8.2.load').with(
94+
content: "LoadModule php8_module /usr/lib/apache2/modules/libphp8.2.so\n",
95+
)
96+
}
97+
end
8798
when '18.04'
8899
context 'on bionic' do
89100
let :params do

0 commit comments

Comments
 (0)