Make fullstaq ruby the default

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

diff --git a/cookbooks/blogs/recipes/default.rb b/cookbooks/blogs/recipes/default.rb
index c3f238cc2301a549023dd0476249c58e680bbdbf..5c650f2427863ed9c896ae647638d97e299bcead 100644 (file)
--- a/cookbooks/blogs/recipes/default.rb
+++ b/cookbooks/blogs/recipes/default.rb
@@ -44,22 +44,29 @@ git "/srv/blogs.openstreetmap.org" do
   group "blogs"
 end
 
+bundle_config "/srv/blogs.openstreetmap.org" do
+  action :nothing
+  user "blogs"
+  group "blogs"
+  settings "deployment" => "true",
+           "without" => "development:test",
+           "build.sqlite3" => "--enable-system-libraries"
+  subscribes :create, "git[/srv/blogs.openstreetmap.org]", :immediately
+end
+
 bundle_install "/srv/blogs.openstreetmap.org" do
   action :nothing
-  options "--deployment --without development test"
-  environment "BUNDLE_PATH" => "vendor/bundle"
   user "blogs"
   group "blogs"
-  subscribes :run, "git[/srv/blogs.openstreetmap.org]", :immediate
+  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"
-  environment "BUNDLE_PATH" => "vendor/bundle"
   user "blogs"
   group "blogs"
-  subscribes :run, "git[/srv/blogs.openstreetmap.org]", :immediate
+  subscribes :run, "git[/srv/blogs.openstreetmap.org]", :immediately
 end
 
 ssl_certificate "blogs.openstreetmap.org" do