Merge pull request #199 from voxpupuli/stdlib9_20230723

puppetlabs/stdlib: Allow 9.x

README.markdown

@@ -160,9 +160,9 @@ and using:
     class { 'rvm::passenger::apache':
         version            => '3.0.11',
         ruby_version       => 'ruby-1.9.3-p448',
-        mininstances       => '3',
-        maxinstancesperapp => '0',
-        maxpoolsize        => '30',
+        mininstances       => 3,
+        maxinstancesperapp => 0,
+        maxpoolsize        => 30,
         spawnmethod        => 'smart-lv2',
     }
 

manifests/dependencies/centos.pp

@@ -1,6 +1,6 @@
 # Install packages needed by RVM on RedHat systems when not using autolibs
 class rvm::dependencies::centos {
-  ensure_packages(['which','gcc','gcc-c++','make','gettext-devel','expat-devel','zlib-devel','openssl-devel',
+  stdlib::ensure_packages(['which','gcc','gcc-c++','make','gettext-devel','expat-devel','zlib-devel','openssl-devel',
       'perl','cpio','gettext-devel','wget','bzip2','libxml2','libxml2-devel','libxslt','libxslt-devel',
   'readline-devel','patch','git','libyaml-devel','libffi-devel','libtool','bison', 'libcurl-devel'])
 }

manifests/dependencies/oraclelinux.pp

@@ -1,6 +1,6 @@
 # Install packages needed by RVM on Oracle Linux when not using autolibs
 class rvm::dependencies::oraclelinux {
-  ensure_packages(['which','gcc','gcc-c++','make','gettext-devel','expat-devel','libcurl-devel',
+  stdlib::ensure_packages(['which','gcc','gcc-c++','make','gettext-devel','expat-devel','libcurl-devel',
       'zlib-devel','openssl-devel','perl','cpio','expat-devel','gettext-devel','wget','bzip2',
   'libxml2','libxml2-devel','libxslt','libxslt-devel','readline-devel','patch','git'])
 }

manifests/dependencies/ubuntu.pp

@@ -1,6 +1,6 @@
 # Install packages needed by RVM on Ubuntu when not using autolibs
 class rvm::dependencies::ubuntu {
-  ensure_packages(['build-essential','bison','openssl','libreadline6','libreadline6-dev','curl','git-core',
+  stdlib::ensure_packages(['build-essential','bison','openssl','libreadline6','libreadline6-dev','curl','git-core',
       'zlib1g','zlib1g-dev','libssl-dev','libyaml-dev','libsqlite3-0','libsqlite3-dev','sqlite3','libxml2-dev',
   'autoconf','libc6-dev'])
 

manifests/passenger/apache.pp

@@ -4,8 +4,8 @@
   $version,
   $rvm_prefix = '/usr/local',
   $mininstances = '1',
-  $maxpoolsize = '6',
-  $poolidletime = '300',
+  $maxpoolsize = 6,
+  $poolidletime = 300,
   $maxinstancesperapp = '0',
   $spawnmethod = 'smart-lv2',
   $proxy_url = undef,

manifests/passenger/dependencies/centos.pp

@@ -1,4 +1,4 @@
 # Package dependencies for Passenger on RedHat
 class rvm::passenger::dependencies::centos {
-  ensure_packages(['libcurl-devel'])
+  stdlib::ensure_packages(['libcurl-devel'])
 }

manifests/passenger/dependencies/oraclelinux.pp

@@ -1,4 +1,4 @@
 # Package dependencies for Passenger on Oracle Linux
 class rvm::passenger::dependencies::oraclelinux {
-  ensure_packages(['libcurl-devel'])
+  stdlib::ensure_packages(['libcurl-devel'])
 }

manifests/passenger/dependencies/ubuntu.pp

@@ -1,4 +1,4 @@
 # Package dependencies for Passenger on Ubuntu
 class rvm::passenger::dependencies::ubuntu {
-  ensure_packages(['curl','libcurl4-gnutls-dev'])
+  stdlib::ensure_packages(['curl','libcurl4-gnutls-dev'])
 }

manifests/system.pp

@@ -27,7 +27,7 @@
   $environment = concat($proxy_environment, ["HOME=${home}"])
 
   if $manage_wget {
-    ensure_packages(['wget'])
+    stdlib::ensure_packages(['wget'])
   }
   if $include_gnupg {
     include gnupg
@@ -67,7 +67,7 @@
     }
   }
   else {
-    ensure_packages(['curl'])
+    stdlib::ensure_packages(['curl'])
 
     exec { 'system-rvm':
       path        => '/usr/bin:/usr/sbin:/bin:/usr/local/bin',

metadata.json

@@ -11,7 +11,7 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.13.0 < 9.0.0"
+      "version_requirement": ">= 4.13.0 < 10.0.0"
     },
     {
       "name": "golja/gnupg",

spec/acceptance/rvm_system_spec.rb

@@ -214,9 +214,9 @@ class { 'apache':
         class { 'rvm::passenger::apache':
           version            => '#{passenger_version}',
           ruby_version       => '#{ruby27_version}',
-          mininstances       => '3',
-          maxinstancesperapp => '0',
-          maxpoolsize        => '30',
+          mininstances       => 3,
+          maxinstancesperapp => 0,
+          maxpoolsize        => 30,
           spawnmethod        => 'smart-lv2',
         }
         /* a simple ruby rack 'hello world' app */
@@ -234,7 +234,7 @@ class { 'rvm::passenger::apache':
           require => File['/var/www/passenger'] ,
         }
         apache::vhost { '#{passenger_domain}':
-          port    => '80',
+          port    => 80,
           docroot => '/var/www/passenger/public',
           docroot_group => '#{rackapp_group}' ,
           docroot_owner => '#{rackapp_user}' ,

spec/spec_helper_acceptance.rb

@@ -3,7 +3,7 @@
 require 'voxpupuli/acceptance/spec_helper_acceptance'
 
 configure_beaker do |host|
-  install_puppet_module_via_pmt_on(host, 'puppet-epel', '>= 3.0.1 < 4.0.0') if fact_on(host, 'os.family') == 'RedHat'
-  install_puppet_module_via_pmt_on(host, 'puppetlabs-apache', '>= 5.7.0 < 7.0.0')
-  install_puppet_module_via_pmt_on(host, 'puppetlabs-java', '>= 6.3.0 < 8.0.0')
+  install_puppet_module_via_pmt_on(host, 'puppet-epel', '>= 3.0.1 < 6.0.0') if fact_on(host, 'os.family') == 'RedHat'
+  install_puppet_module_via_pmt_on(host, 'puppetlabs-apache', '>= 5.7.0 < 12.0.0')
+  install_puppet_module_via_pmt_on(host, 'puppetlabs-java', '>= 6.3.0 < 11.0.0')
 end