diff --git a/manifests/params.pp b/manifests/params.pp index be3fd6b24..ff2bf0ce7 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -380,6 +380,7 @@ '12' => '8.2', # Debian Bookworm '20.04' => '7.4', # Ubuntu Foccal Fossal '22.04' => '8.1', # Ubuntu Jammy + '24.04' => '8.3', # Ubuntu Noble default => '7.2', # Ubuntu Bionic, Cosmic and Disco } $_base_mod_packages = { diff --git a/metadata.json b/metadata.json index 906dd3490..92afe948b 100644 --- a/metadata.json +++ b/metadata.json @@ -65,7 +65,8 @@ "operatingsystemrelease": [ "18.04", "20.04", - "22.04" + "22.04", + "24.04" ] }, { diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb index 8fd3dc9c2..a42162fce 100644 --- a/spec/acceptance/mod_php_spec.rb +++ b/spec/acceptance/mod_php_spec.rb @@ -53,6 +53,10 @@ class { 'apache::mod::php': } describe file("#{apache_hash['mod_dir']}/php8.1.conf") do it { is_expected.to contain 'DirectoryIndex index.php' } end + elsif os[:family] == 'ubuntu' && os[:release] == '24.04' + describe file("#{apache_hash['mod_dir']}/php8.3.conf") do + it { is_expected.to contain 'DirectoryIndex index.php' } + end elsif os[:family] == 'redhat' && os[:release] =~ %r{^(8)\b} describe file("#{apache_hash['mod_dir']}/php7.conf") do it { is_expected.to contain 'DirectoryIndex index.php' }