From c7bc1045148a6a178ec6b978b5e072bea92b4107 Mon Sep 17 00:00:00 2001 From: Keith Dahlby Date: Sat, 16 Apr 2016 13:32:47 -0500 Subject: [PATCH 1/4] Add path to mail-catcher --- puppet/manifests/base.pp | 1 + 1 file changed, 1 insertion(+) diff --git a/puppet/manifests/base.pp b/puppet/manifests/base.pp index bc835bcd..9aa7da2c 100644 --- a/puppet/manifests/base.pp +++ b/puppet/manifests/base.pp @@ -14,6 +14,7 @@ ruby_version => "2.2.1", } -> exec { 'mail-catcher': + path => ["/bin", "/usr/bin"], command => 'gem install mailcatcher' } From d340852f3364ff228cee1ea165dfdae732b59b50 Mon Sep 17 00:00:00 2001 From: Keith Dahlby Date: Sun, 15 May 2016 03:42:10 -0500 Subject: [PATCH 2/4] Install ruby-dev to allow building native gems --- puppet/manifests/base.pp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/puppet/manifests/base.pp b/puppet/manifests/base.pp index 9aa7da2c..a1d311da 100644 --- a/puppet/manifests/base.pp +++ b/puppet/manifests/base.pp @@ -13,6 +13,10 @@ class { 'ruby_install': ruby_version => "2.2.1", } -> + exec { 'apt-install ruby-dev': + path => ["/bin", "/usr/bin", "/sbin"], + command => "apt-get install ruby-dev -y" + } -> exec { 'mail-catcher': path => ["/bin", "/usr/bin"], command => 'gem install mailcatcher' From 4c07119162d8df478abe9f20b31552cc62db89ca Mon Sep 17 00:00:00 2001 From: Richard Frank Date: Tue, 2 Aug 2016 14:47:09 -0600 Subject: [PATCH 3/4] Updates wkhtmlox to newest version (fixes broken sources), installs mailcatcher gem via rbenv --- Puppetfile | 2 +- Puppetfile.lock | 4 ++-- puppet/manifests/base.pp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Puppetfile b/Puppetfile index 19bd7519..8a06f560 100644 --- a/Puppetfile +++ b/Puppetfile @@ -12,4 +12,4 @@ mod 'saz/memcached' mod 'thomasvandoren/redis' mod 'willdurand/nodejs' -mod 'jlondon/wkhtmltox', '1.0.9' +mod 'jlondon/wkhtmltox', '1.0.11' diff --git a/Puppetfile.lock b/Puppetfile.lock index bb1dd38e..3c4aafb8 100644 --- a/Puppetfile.lock +++ b/Puppetfile.lock @@ -2,7 +2,7 @@ FORGE remote: https://forgeapi.puppetlabs.com specs: alup-rbenv (1.2.0) - jlondon-wkhtmltox (1.0.9) + jlondon-wkhtmltox (1.0.11) maestrodev-wget (>= 1.5.0) puppetlabs-stdlib (>= 0) maestrodev-wget (1.5.7) @@ -29,7 +29,7 @@ FORGE DEPENDENCIES alup-rbenv (>= 0) - jlondon-wkhtmltox (= 1.0.9) + jlondon-wkhtmltox (= 1.0.11) puppetlabs-apt (>= 0) puppetlabs-postgresql (>= 0) puppetlabs-stdlib (= 4.2.0) diff --git a/puppet/manifests/base.pp b/puppet/manifests/base.pp index a1d311da..8705385d 100644 --- a/puppet/manifests/base.pp +++ b/puppet/manifests/base.pp @@ -17,9 +17,9 @@ path => ["/bin", "/usr/bin", "/sbin"], command => "apt-get install ruby-dev -y" } -> - exec { 'mail-catcher': - path => ["/bin", "/usr/bin"], - command => 'gem install mailcatcher' + rbenv::gem { 'mailcatcher': + ruby => '2.2.1', + user => 'vagrant' } class { 'wkhtmltox': From 1a4fed729189a9c2ef2d16e7d56f20f6eeac09fe Mon Sep 17 00:00:00 2001 From: Keith Dahlby Date: Wed, 3 Aug 2016 13:46:04 -0500 Subject: [PATCH 4/4] Bump BUNDLED WITH --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 774f9c12..63432cbb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -497,4 +497,4 @@ DEPENDENCIES wkhtmltopdf-heroku BUNDLED WITH - 1.11.2 + 1.12.5