From: Tom Hughes <tom@compton.nu>
Date: Fri, 21 Mar 2025 17:28:52 +0000 (+0000)
Subject: Use system gem to install dbus-systemd for prometheus
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/5e373778a0e18992a119315538721c7ff52d40a9

Use system gem to install dbus-systemd for prometheus
---

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index 831878ab4..4b1d6d056 100644
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -318,7 +318,9 @@ link "/etc/resolv.conf" do
   to "../run/systemd/resolve/stub-resolv.conf"
 end
 
-gem_package "dbus-systemd"
+gem_package "dbus-systemd" do
+  gem_binary node[:ruby][:system_gem]
+end
 
 prometheus_exporter "resolved" do
   port 10028
diff --git a/cookbooks/ruby/attributes/default.rb b/cookbooks/ruby/attributes/default.rb
index 194f29957..39ac754e5 100644
--- a/cookbooks/ruby/attributes/default.rb
+++ b/cookbooks/ruby/attributes/default.rb
@@ -1,5 +1,16 @@
 default[:ruby][:fullstaq] = true
 
+default[:ruby][:system_version] = if platform?("debian")
+                                    "3.1"
+                                  elsif node[:lsb][:release].to_f < 22.04
+                                    "2.7"
+                                  else
+                                    "3.0"
+                                  end
+default[:ruby][:system_interpreter] = "/usr/bin/ruby#{node[:ruby][:system_version]}"
+default[:ruby][:system_gem] = "/usr/bin/gem#{node[:ruby][:system_version]}"
+default[:ruby][:system_bundle] = "/usr/bin/bundle#{node[:ruby][:system_version]}"
+
 if node[:ruby][:fullstaq]
 
   default[:ruby][:version] = "3.4"
@@ -9,15 +20,9 @@ if node[:ruby][:fullstaq]
 
 else
 
-  default[:ruby][:version] = if platform?("debian")
-                               "3.1"
-                             elsif node[:lsb][:release].to_f < 22.04
-                               "2.7"
-                             else
-                               "3.0"
-                             end
-  default[:ruby][:interpreter] = "/usr/bin/ruby#{node[:ruby][:version]}"
-  default[:ruby][:gem] = "/usr/bin/gem#{node[:ruby][:version]}"
-  default[:ruby][:bundle] = "/usr/bin/bundle#{node[:ruby][:version]}"
+  default[:ruby][:version] = node[:ruby][:system_version]
+  default[:ruby][:interpreter] = node[:ruby][:system_interpreter]
+  default[:ruby][:gem] = node[:ruby][:system_gem]
+  default[:ruby][:bundle] = node[:ruby][:system_bundle]
 
 end