Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(CAT-2100) Add Debian 12 support #2572

Merged
merged 1 commit into from
Nov 19, 2024
+5 −3
Merged

(CAT-2100) Add Debian 12 support #2572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@
"operatingsystem": "Debian",
"operatingsystemrelease": [
"10",
"11"
"11",
"12"
]
},
{
Expand Down
3 changes: 2 additions & 1 deletion spec/acceptance/mod_php_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ class { 'apache::mod::php': }
content => "<?php phpinfo(); ?>\\n",
}
MANIFEST

it 'succeeds in puppeting php' do
apply_manifest(pp, catch_failures: true)
end
Expand All @@ -36,7 +37,7 @@ class { 'apache::mod::php': }
describe file("#{apache_hash['mod_dir']}/php7.4.conf") do
it { is_expected.to contain 'DirectoryIndex index.php' }
end
elsif os[:family] == 'debian' && os[:release] =~ %r{^12\.}
elsif os[:family] == 'debian' && os[:release] =~ %r{^12}
describe file("#{apache_hash['mod_dir']}/php8.2.conf") do
it { is_expected.to contain 'DirectoryIndex index.php' }
end
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/mod/php_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@

it {
expect(subject).to contain_file('php8.2.load').with(
content: "LoadModule php8_module /usr/lib/apache2/modules/libphp8.2.so\n",
content: "LoadModule php_module /usr/lib/apache2/modules/libphp8.2.so\n",
)
}
end
Expand Down