Skip to content

Commit

Permalink
Update upper bounds of modules used in acceptance tests
Browse files Browse the repository at this point in the history
  • Loading branch information
ekohl committed Jan 9, 2024
1 parent a607b87 commit 6ebdd81
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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',
}

Expand Down
4 changes: 2 additions & 2 deletions manifests/passenger/apache.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions spec/acceptance/rvm_system_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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}' ,
Expand Down
6 changes: 3 additions & 3 deletions spec/spec_helper_acceptance.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 6ebdd81

Please sign in to comment.