Merge pull request #2572 from puppetlabs/CAT-2100-add-debian-12-support

(CAT-2100) Add Debian 12 support
puppetlabs · Nov 19, 2024 · 925cd89 · 925cd89
2 parents d50585c + 19c0e9d
commit 925cd89
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,7 +49,8 @@ @@
           "operatingsystem": "Debian",
           "operatingsystemrelease": [
             "10",
-            "11"
+            "11",
+            "12"
           ]
         },
         {
@@ Expand Down @@