Merge pull request #635 from voxpupuli/stdlib

voxpupuli · Aug 26, 2021 · 6c8080c · 6c8080c
2 parents d354c5b + e53d63b
commit 6c8080c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/metadata.json b/metadata.json
@@ -11,7 +11,7 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.16.0 < 8.0.0"
+      "version_requirement": ">= 4.16.0 < 9.0.0"
     },
     {
       "name": "puppetlabs/apt",
@@ -23,11 +23,11 @@
     },
     {
       "name": "puppet/zypprepo",
-      "version_requirement": ">= 2.0.0 < 3.0.0"
+      "version_requirement": ">= 2.0.0 < 5.0.0"
     },
     {
       "name": "puppet/archive",
-      "version_requirement": ">= 1.0.0 < 6.0.0"
+      "version_requirement": ">= 1.0.0 < 8.0.0"
     }
   ],
   "requirements": [

diff --git a/spec/classes/php_spec.rb b/spec/classes/php_spec.rb
@@ -10,6 +10,8 @@
       php_cli_package = case facts[:os]['name']
                         when 'Debian'
                           case facts[:os]['release']['major']
+                          when '11'
+                            'php7.4-cli'
                           when '10'
                             'php7.3-cli'
                           when '9'
@@ -32,6 +34,8 @@
       php_fpm_package = case facts[:os]['name']
                         when 'Debian'
                           case facts[:os]['release']['major']
+                          when '11'
+                            'php7.4-fpm'
                           when '10'
                             'php7.3-fpm'
                           when '9'
@@ -54,6 +58,8 @@
       php_dev_package = case facts[:os]['name']
                         when 'Debian'
                           case facts[:os]['release']['major']
+                          when '11'
+                            'php7.4-dev'
                           when '10'
                             'php7.3-dev'
                           when '9'
@@ -175,6 +181,8 @@
                     case facts[:os]['name']
                     when 'Debian'
                       case facts[:os]['release']['major']
+                      when '11'
+                        '/etc/php/7.4/fpm/pool.d/www.conf'
                       when '10'
                         '/etc/php/7.3/fpm/pool.d/www.conf'
                       when '9'
@@ -217,6 +225,8 @@
                     case facts[:os]['name']
                     when 'Debian'
                       case facts[:os]['release']['major']
+                      when '11'
+                        '/etc/php/7.4/fpm/pool.d/www.conf'
                       when '10'
                         '/etc/php/7.3/fpm/pool.d/www.conf'
                       when '9'
@@ -259,6 +269,8 @@
                     case facts[:os]['name']
                     when 'Debian'
                       case facts[:os]['release']['major']
+                      when '11'
+                        '/etc/php/7.4/fpm/pool.d/www.conf'
                       when '10'
                         '/etc/php/7.3/fpm/pool.d/www.conf'
                       when '9'

diff --git a/spec/defines/extension_spec.rb b/spec/defines/extension_spec.rb
@@ -12,6 +12,8 @@
         etcdir =  case facts[:os]['name']
                   when 'Debian'
                     case facts[:os]['release']['major']
+                    when '11'
+                      '/etc/php/7.4/mods-available'
                     when '10'
                       '/etc/php/7.3/mods-available'
                     when '9'

diff --git a/spec/defines/fpm_pool_spec.rb b/spec/defines/fpm_pool_spec.rb
@@ -15,6 +15,8 @@
           let(:params) { {} }
 
           case facts[:os]['release']['major']
+          when '11'
+            it { is_expected.to contain_file('/etc/php/7.4/fpm/pool.d/unique-name.conf') }
           when '10'
             it { is_expected.to contain_file('/etc/php/7.3/fpm/pool.d/unique-name.conf') }
           when '9'