opuppet/module-nginx
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev

Browse source
This commit is contained in:
Lebedev Vadim 2014-01-17 20:08:56 +04:00
commit 26cf99c8e4
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis/Gemfile
View file

@ -3,6 +3,8 @@ source 'https://rubygems.org'
group :rake do group :rake do
gem 'puppetlabs_spec_helper' gem 'puppetlabs_spec_helper'
gem 'librarian-puppet-maestrodev' gem 'librarian-puppet-maestrodev'
gem 'open3_backport', :platforms => :ruby_18
gem 'json', :platforms => :ruby_18
end end
if puppetversion = ENV['PUPPET_GEM_VERSION'] if puppetversion = ENV['PUPPET_GEM_VERSION']

2
manifests/init.pp
View file

@ -63,7 +63,7 @@ class nginx (
include stdlib include stdlib
if (!is_string($worker_processes)) and (!is_integer($worker_processes)) { if (!is_string($worker_processes)) and (!is_integer($worker_processes)) {
fail('$worker_processes must be be an integer or have value "auto".') fail('$worker_processes must be an integer or have value "auto".')
} }
if (!is_integer($worker_connections)) { if (!is_integer($worker_connections)) {
fail('$worker_connections must be an integer.') fail('$worker_connections must be an integer.')