Merge remote-tracking branch 'github/pull/710'

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

diff --git a/cookbooks/blogs/recipes/default.rb b/cookbooks/blogs/recipes/default.rb
index 6b181f2090714e70b1d461e4f45d2e61cf24dc20..0fb2cc7aad06dc4739e903125d59de39ec871bdb 100644 (file)
--- a/cookbooks/blogs/recipes/default.rb
+++ b/cookbooks/blogs/recipes/default.rb
@@ -42,22 +42,24 @@ git "/srv/blogs.openstreetmap.org" do
   depth 1
   user "blogs"
   group "blogs"
   depth 1
   user "blogs"
   group "blogs"

-  notifies :run, "bundle_install[/srv/blogs.openstreetmap.org]", :immediately

 end
 
 bundle_install "/srv/blogs.openstreetmap.org" do
   action :nothing
 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
+  options "--deployment --without development test"
+  environment "BUNDLE_PATH" => "vendor/bundle"
+  user "blogs"
+  group "blogs"
+  subscribes :run, "git[/srv/blogs.openstreetmap.org]", :immediately

 end
 
 bundle_exec "/srv/blogs.openstreetmap.org" do
   action :nothing
   command "pluto build -t osm -o build"
 end
 
 bundle_exec "/srv/blogs.openstreetmap.org" do
   action :nothing
   command "pluto build -t osm -o build"

+  environment "BUNDLE_PATH" => "vendor/bundle"

   user "blogs"
   group "blogs"
   user "blogs"
   group "blogs"

+  subscribes :run, "git[/srv/blogs.openstreetmap.org]", :immediately

 end
 
 ssl_certificate "blogs.openstreetmap.org" do
 end
 
 ssl_certificate "blogs.openstreetmap.org" do