Standardise on using bundle_config to configure bundler

[chef.git] / cookbooks / blogs / recipes / default.rb

diff --git a/cookbooks/blogs/recipes/default.rb b/cookbooks/blogs/recipes/default.rb
index 6b181f2090714e70b1d461e4f45d2e61cf24dc20..b7d47e445f7ce87a143c1737aed18f7c1d5c0fcd 100644 (file)
--- a/cookbooks/blogs/recipes/default.rb
+++ b/cookbooks/blogs/recipes/default.rb
@@ -42,15 +42,20 @@ git "/srv/blogs.openstreetmap.org" do
   depth 1
   user "blogs"
   group "blogs"
-  notifies :run, "bundle_install[/srv/blogs.openstreetmap.org]", :immediately
+end
+
+bundle_config "/srv/blogs.openstreetmap.org" do
+  user "blogs"
+  group "blogs"
+  settings "deployment" => "true",
+           "without" => "development:test"
 end
 
 bundle_install "/srv/blogs.openstreetmap.org" do
   action :nothing
-  options "--deployment"
-  user "root"
-  group "root"
-  notifies :run, "bundle_exec[/srv/blogs.openstreetmap.org]", :immediately
+  user "blogs"
+  group "blogs"
+  subscribes :run, "git[/srv/blogs.openstreetmap.org]", :immediately
 end
 
 bundle_exec "/srv/blogs.openstreetmap.org" do
@@ -58,6 +63,7 @@ bundle_exec "/srv/blogs.openstreetmap.org" do
   command "pluto build -t osm -o build"
   user "blogs"
   group "blogs"
+  subscribes :run, "git[/srv/blogs.openstreetmap.org]", :immediately
 end
 
 ssl_certificate "blogs.openstreetmap.org" do