From e3d78deb1037fd51772c1233fbe3aacad08842a0 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Thu, 20 Feb 2025 18:36:07 +0000
Subject: [PATCH] Standardise on using bundle_config to configure bundler

---
 cookbooks/blogs/recipes/default.rb              | 10 +++++++---
 .../blogs/templates/default/blogs-update.erb    |  2 --
 cookbooks/oxidized/recipes/default.rb           |  7 ++++++-
 cookbooks/serverinfo/recipes/default.rb         | 17 +++++++++--------
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/cookbooks/blogs/recipes/default.rb b/cookbooks/blogs/recipes/default.rb
index 0fb2cc7aa..b7d47e445 100644
--- a/cookbooks/blogs/recipes/default.rb
+++ b/cookbooks/blogs/recipes/default.rb
@@ -44,10 +44,15 @@ git "/srv/blogs.openstreetmap.org" do
   group "blogs"
 end
 
+bundle_config "/srv/blogs.openstreetmap.org" do
+  user "blogs"
+  group "blogs"
+  settings "deployment" => "true",
+           "without" => "development:test"
+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]", :immediately
@@ -56,7 +61,6 @@ 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]", :immediately
diff --git a/cookbooks/blogs/templates/default/blogs-update.erb b/cookbooks/blogs/templates/default/blogs-update.erb
index a7d021495..15cc82483 100644
--- a/cookbooks/blogs/templates/default/blogs-update.erb
+++ b/cookbooks/blogs/templates/default/blogs-update.erb
@@ -2,8 +2,6 @@
 
 cd /srv/blogs.openstreetmap.org
 
-export BUNDLE_PATH="vendor/bundle"
-
 <%= node[:ruby][:bundle] %> exec pluto \
        --quieter \
        --config=/srv/blogs.openstreetmap.org build \
diff --git a/cookbooks/oxidized/recipes/default.rb b/cookbooks/oxidized/recipes/default.rb
index fce3126d3..773a3d7b5 100644
--- a/cookbooks/oxidized/recipes/default.rb
+++ b/cookbooks/oxidized/recipes/default.rb
@@ -130,9 +130,14 @@ git "/var/lib/oxidized/configs.git" do
   group "oxidized"
 end
 
+bundle_config "/opt/oxidized/daemon" do
+  user "oxidized"
+  group "oxidized"
+  settings "deployment" => "true"
+end
+
 bundle_install "/opt/oxidized/daemon" do
   action :nothing
-  options "--deployment"
   user "oxidized"
   group "oxidized"
   notifies :restart, "service[oxidized]"
diff --git a/cookbooks/serverinfo/recipes/default.rb b/cookbooks/serverinfo/recipes/default.rb
index 2bbc31e5b..3999ffe80 100644
--- a/cookbooks/serverinfo/recipes/default.rb
+++ b/cookbooks/serverinfo/recipes/default.rb
@@ -71,15 +71,18 @@ directory "/srv/hardware.openstreetmap.org/vendor" do
   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"
-  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
 
@@ -88,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"
-  environment "LANG" => "C.UTF-8",
-              "BUNDLE_PATH" => "vendor/bundle",
-              "BUNDLE_DEPLOYMENT" => "1"
+  environment "LANG" => "C.UTF-8"
 end
 
 ssl_certificate "hardware.openstreetmap.org" do
-- 
2.39.5