From 6ebdd810aa73d6fc4463650d3748a0907418639b Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Tue, 9 Jan 2024 14:36:53 +0100
Subject: [PATCH] Update upper bounds of modules used in acceptance tests

---
 README.markdown                    | 6 +++---
 manifests/passenger/apache.pp      | 4 ++--
 spec/acceptance/rvm_system_spec.rb | 8 ++++----
 spec/spec_helper_acceptance.rb     | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/README.markdown b/README.markdown
index 3ae6d82c..da3983a4 100644
--- a/README.markdown
+++ b/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',
     }
 
diff --git a/manifests/passenger/apache.pp b/manifests/passenger/apache.pp
index e9c8fff8..d572823a 100644
--- a/manifests/passenger/apache.pp
+++ b/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,
diff --git a/spec/acceptance/rvm_system_spec.rb b/spec/acceptance/rvm_system_spec.rb
index f6d964e7..02eb3476 100644
--- a/spec/acceptance/rvm_system_spec.rb
+++ b/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}' ,
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 5b17c7d3..9c88b944 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/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