diff --git a/metadata.json b/metadata.json index f80bd2ec3..bc12b33c3 100644 --- a/metadata.json +++ b/metadata.json @@ -49,7 +49,8 @@ "operatingsystem": "Debian", "operatingsystemrelease": [ "10", - "11" + "11", + "12" ] }, { diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb index 5c9f41e21..8fd3dc9c2 100644 --- a/spec/acceptance/mod_php_spec.rb +++ b/spec/acceptance/mod_php_spec.rb @@ -20,6 +20,7 @@ class { 'apache::mod::php': } content => "\\n", } MANIFEST + it 'succeeds in puppeting php' do apply_manifest(pp, catch_failures: true) end @@ -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 diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb index 8c4e774d6..9cb56b04d 100644 --- a/spec/classes/mod/php_spec.rb +++ b/spec/classes/mod/php_spec.rb @@ -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