Merge pull request #633 from voxpupuli/debian11

Author: smortex

manifests/globals.pp

@@ -28,12 +28,15 @@
   $default_php_version = $facts['os']['name'] ? {
     'Debian' => $facts['os']['release']['major'] ? {
       '9'     => '7.0',
-      default => '7.3',
+      '10'    => '7.3',
+      '11'    => '7.4',
+      default => fail("Unsupported Debian release: ${fact('os.release.major')}"),
     },
     'Ubuntu' => $facts['os']['release']['major'] ? {
-      '20.04' => '7.4',
       '16.04' => '7.0',
-      default => '7.2',
+      '18.04' => '7.2',
+      '20.04' => '7.4',
+      default => fail("Unsupported Ubuntu release: ${fact('os.release.major')}"),
     },
     default => '5.x',
   }

metadata.json

@@ -49,7 +49,8 @@
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
         "9",
-        "10"
+        "10",
+        "11"
       ]
     },
     {

spec/acceptance/php_spec.rb

@@ -22,6 +22,8 @@
       packagename = 'php7.0-fpm'
     when %r{debian-10}
       packagename = 'php7.3-fpm'
+    when %r{debian-11}
+      packagename = 'php7.4-fpm'
     end
     describe package(packagename) do
       it { is_expected.to be_installed }
@@ -94,6 +96,8 @@
       packagename = 'php7.0-fpm'
     when %r{debian-10}
       packagename = 'php7.3-fpm'
+    when %r{debian-11}
+      packagename = 'php7.4-fpm'
     end
     describe package(packagename) do
       it { is_expected.to be_installed }