Run pluto through bundler

diff --git a/cookbooks/blogs/recipes/default.rb b/cookbooks/blogs/recipes/default.rb
index da3b0da61cf8322051d92acbd8a71b93cbf8d7dd..ea0b3dc8f3ff6bc54e0f261bf8e34c7067bb7de6 100644 (file)
--- a/cookbooks/blogs/recipes/default.rb
+++ b/cookbooks/blogs/recipes/default.rb
@@ -55,7 +55,7 @@ end
 
 execute "/srv/blogs.openstreetmap.org" do
   action :nothing
-  command "/usr/local/bin/pluto build -t osm -o build"
+  command "bundle exec /usr/local/bin/pluto build -t osm -o build"
   cwd "/srv/blogs.openstreetmap.org"
   user "blogs"
   group "blogs"

diff --git a/cookbooks/blogs/templates/default/cron.erb b/cookbooks/blogs/templates/default/cron.erb
index 0d4976087bb8bd703c04031d5a8ae398fd4159ad..c2d6dfb1693942c9ba55ad2d71724adc530159e4 100644 (file)
--- a/cookbooks/blogs/templates/default/cron.erb
+++ b/cookbooks/blogs/templates/default/cron.erb
@@ -2,4 +2,4 @@
 
 MAILTO=admins@openstreetmap.org
 
-*/30 * * * * blogs /usr/local/bin/pluto --quieter --config=/srv/blogs.openstreetmap.org build --dbpath=/srv/blogs.openstreetmap.org --template=osm --output=/srv/blogs.openstreetmap.org/build /srv/blogs.openstreetmap.org/planet.ini > /dev/null
+*/30 * * * * blogs cd /srv/blogs.openstreetmap.org; bundle exec /usr/local/bin/pluto --quieter --config=/srv/blogs.openstreetmap.org build --dbpath=/srv/blogs.openstreetmap.org --template=osm --output=/srv/blogs.openstreetmap.org/build /srv/blogs.openstreetmap.org/planet.ini > /dev/null