Standardise on using bundle_config to configure bundler

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

diff --git a/cookbooks/serverinfo/recipes/default.rb b/cookbooks/serverinfo/recipes/default.rb
index 82a61185b1e970437b2b9ca9077f8a7c873d5038..3999ffe809def8de1d57b1b095aad6dc4cd0641d 100644 (file)
--- a/cookbooks/serverinfo/recipes/default.rb
+++ b/cookbooks/serverinfo/recipes/default.rb
@@ -64,23 +64,25 @@ directory "/srv/hardware.openstreetmap.org/_site" do
   group "nogroup"
 end
 
   group "nogroup"
 end
 

-# FIXME: fix the the vendor directory permissions from prior root installs

 directory "/srv/hardware.openstreetmap.org/vendor" do
   action :create
 directory "/srv/hardware.openstreetmap.org/vendor" do
   action :create

-  recursive true

   owner "nobody"
   group "nogroup"
   owner "nobody"
   group "nogroup"

+  notifies :run, "bundle_install[/srv/hardware.openstreetmap.org]", :immediately
+end
+
+bundle_config "/srv/hardware.openstreetmap.org" do
+  user "nobody"
+  group "nogroup"
+  settings "deployment" => "true",
+           "without" => "development:test",
+           "jobs" => node.cpu_cores.to_s

 end
 
 bundle_install "/srv/hardware.openstreetmap.org" do
   action :nothing
   user "nobody"
   group "nogroup"
 end
 
 bundle_install "/srv/hardware.openstreetmap.org" do
   action :nothing
   user "nobody"
   group "nogroup"

-  environment "BUNDLE_FROZEN" => "true",
-              "BUNDLE_WITHOUT" => "development:test",
-              "BUNDLE_PATH" => "vendor/bundle",
-              "BUNDLE_DEPLOYMENT" => "1",
-              "BUNDLE_JOBS" => node.cpu_cores.to_s

   notifies :run, "bundle_exec[/srv/hardware.openstreetmap.org]"
 end
 
   notifies :run, "bundle_exec[/srv/hardware.openstreetmap.org]"
 end
 


@@ -89,9 +91,7 @@ bundle_exec "/srv/hardware.openstreetmap.org" do
   command "jekyll build --trace --disable-disk-cache --baseurl=https://hardware.openstreetmap.org"
   user "nobody"
   group "nogroup"
   command "jekyll build --trace --disable-disk-cache --baseurl=https://hardware.openstreetmap.org"
   user "nobody"
   group "nogroup"

-  environment "LANG" => "C.UTF-8",
-              "BUNDLE_PATH" => "vendor/bundle",
-              "BUNDLE_DEPLOYMENT" => "1"
+  environment "LANG" => "C.UTF-8"

 end
 
 ssl_certificate "hardware.openstreetmap.org" do
 end
 
 ssl_certificate "hardware.openstreetmap.org" do