blogs: fix build in test

diff --git a/cookbooks/blogs/recipes/default.rb b/cookbooks/blogs/recipes/default.rb
index 6ebe4c2a2e2ffbe084073bcd219ab447aba9cb2b..c3f238cc2301a549023dd0476249c58e680bbdbf 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"
-  notifies :run, "bundle_install[/srv/blogs.openstreetmap.org]", :immediately
 end
 
 bundle_install "/srv/blogs.openstreetmap.org" do
   action :nothing
-  options "--deployment"
+  options "--deployment --without development test"
+  environment "BUNDLE_PATH" => "vendor/bundle"
   user "blogs"
   group "blogs"
-  notifies :run, "bundle_exec[/srv/blogs.openstreetmap.org]", :immediately
+  subscribes :run, "git[/srv/blogs.openstreetmap.org]", :immediate
 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"
+  subscribes :run, "git[/srv/blogs.openstreetmap.org]", :immediate
 end
 
 ssl_certificate "blogs.openstreetmap.org" do

diff --git a/cookbooks/blogs/templates/default/blogs-update.erb b/cookbooks/blogs/templates/default/blogs-update.erb
index 15cc82483678222e75d58330689511e8aa9aa99a..a7d02149531690c68f7ad6e96bf6739cbb7d822f 100644 (file)
--- a/cookbooks/blogs/templates/default/blogs-update.erb
+++ b/cookbooks/blogs/templates/default/blogs-update.erb
@@ -2,6 +2,8 @@
 
 cd /srv/blogs.openstreetmap.org
 
+export BUNDLE_PATH="vendor/bundle"
+
 <%= node[:ruby][:bundle] %> exec pluto \
        --quieter \
        --config=/srv/blogs.openstreetmap.org build \