From 643e8032982749f21c63454660ffedbf2edcaa05 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Tue, 14 Jan 2014 14:46:26 +0300 Subject: [PATCH 1/2] manifests/conf.pp: fixed a typo in error message. --- manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index c2cf45d..3f17d1a 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -63,7 +63,7 @@ class nginx ( include stdlib 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)) { fail('$worker_connections must be an integer.') From b790d9644654df780d53ff3d2dd24843d595564f Mon Sep 17 00:00:00 2001 From: Matthew Haughton <3flex@users.noreply.github.com> Date: Thu, 16 Jan 2014 11:39:08 -0500 Subject: [PATCH 2/2] workaround missing librarian-puppet dependencies librarian-puppet-maestrodev gem specifies Ruby 1.8 dependencies incorrectly. open3_backport and json are required on Ruby 1.8 but are not currently installed. See https://github.com/maestrodev/librarian-puppet/issues/16 --- .travis/Gemfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis/Gemfile b/.travis/Gemfile index c304cbf..8af652f 100644 --- a/.travis/Gemfile +++ b/.travis/Gemfile @@ -3,6 +3,8 @@ source 'https://rubygems.org' group :rake do gem 'puppetlabs_spec_helper' gem 'librarian-puppet-maestrodev' + gem 'open3_backport', :platforms => :ruby_18 + gem 'json', :platforms => :ruby_18 end if puppetversion = ENV['PUPPET_GEM_VERSION']