From: Tom Hughes <tom@compton.nu>
Date: Sun, 10 Jul 2022 18:44:07 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pull/508'
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/ddd5881f47d2eaf1fd585d831bc787fa182def72?hp=2ca7c974fd25e6f900fff9575a23dbe28c83a546

Merge remote-tracking branch 'github/pull/508'
---

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 679ff6b4c..513cee803 100644
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -71,6 +71,7 @@ package %w[
   libpqxx-dev
   libcrypto++-dev
   libyajl-dev
+  libfmt-dev
   zlib1g-dev
 ]
 
diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb
index ff33c73b5..d2c1b36bd 100644
--- a/cookbooks/hardware/attributes/default.rb
+++ b/cookbooks/hardware/attributes/default.rb
@@ -58,7 +58,12 @@ if File.exist?("/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor") &&
   default[:sysfs][:cpufreq_ondemand][:parameters][:"devices/system/cpu/cpufreq/ondemand/sampling_down_factor"] = "100"
 end
 
-if File.exist?("/sys/devices/system/cpu/cpu0/power/energy_perf_bias")
+energy_perf_bias = Dir.glob("/sys/devices/system/cpu/cpu*/power/energy_perf_bias")
+
+unless energy_perf_bias.empty?
   default[:sysfs][:cpu_power_energy_perf_bias][:comment] = "Set CPU Energy-Performance Bias Preference to performance"
-  default[:sysfs][:cpu_power_energy_perf_bias][:parameters][:"devices/system/cpu/cpu*/power/energy_perf_bias"] = "0"
+
+  energy_perf_bias.sort.each do |path|
+    default[:sysfs][:cpu_power_energy_perf_bias][:parameters][path.sub(%r{^/sys/}, "")] = "0"
+  end
 end
diff --git a/cookbooks/nominatim/recipes/version4.rb b/cookbooks/nominatim/recipes/version4.rb
index c9bdf471e..7b218d951 100644
--- a/cookbooks/nominatim/recipes/version4.rb
+++ b/cookbooks/nominatim/recipes/version4.rb
@@ -285,7 +285,7 @@ frontends = search(:node, "recipes:web\\:\\:frontend").sort_by(&:name)
 
 nginx_site "nominatim" do
   template "nginx.erb"
-  directory build_directory
+  directory project_directory
   variables :pools => node[:nominatim][:fpm_pools],
             :frontends => frontends,
             :confdir => "#{basedir}/etc",
diff --git a/cookbooks/planet/recipes/replication.rb b/cookbooks/planet/recipes/replication.rb
index 0a9387d19..a31f98288 100644
--- a/cookbooks/planet/recipes/replication.rb
+++ b/cookbooks/planet/recipes/replication.rb
@@ -317,6 +317,7 @@ systemd_service "replication-hourly" do
   description "Hourly replication"
   user "planet"
   exec_start "/usr/local/bin/osmosis -q --merge-replication-files workingDirectory=/var/lib/replication/hour"
+  environment "LD_PRELOAD" => "/opt/flush/flush.so"
   private_tmp true
   private_devices true
   protect_system "full"
@@ -360,6 +361,7 @@ systemd_service "replication-daily" do
   description "Daily replication"
   user "planet"
   exec_start "/usr/local/bin/osmosis -q --merge-replication-files workingDirectory=/var/lib/replication/day"
+  environment "LD_PRELOAD" => "/opt/flush/flush.so"
   private_tmp true
   private_devices true
   protect_system "full"
diff --git a/cookbooks/supybot/templates/default/git.conf.erb b/cookbooks/supybot/templates/default/git.conf.erb
index a410105ce..cb418b60d 100644
--- a/cookbooks/supybot/templates/default/git.conf.erb
+++ b/cookbooks/supybot/templates/default/git.conf.erb
@@ -226,7 +226,7 @@ commit message = [%s|%b|%a] %m %l
 short name = vespucci
 url = https://github.com/MarcusWolschon/osmeditor4android.git
 branch = master
-commit link = https://github.com//MarcusWolschon/osmeditor4android/commit/%c
+commit link = https://github.com/MarcusWolschon/osmeditor4android/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
diff --git a/roles/balerion.rb b/roles/balerion.rb
index 2a168171a..56b88cc39 100644
--- a/roles/balerion.rb
+++ b/roles/balerion.rb
@@ -37,7 +37,7 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "12/main",
+      :cluster => "14/main",
       :postgis => "3"
     },
     :mapnik => "3.1",
diff --git a/roles/bowser.rb b/roles/bowser.rb
index 8cc8954b6..1789c1096 100644
--- a/roles/bowser.rb
+++ b/roles/bowser.rb
@@ -37,7 +37,7 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "12/main",
+      :cluster => "14/main",
       :postgis => "3"
     },
     :mapnik => "3.1",
diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index a3dbedfb7..36140c371 100644
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -31,12 +31,12 @@ default_attributes(
         :listen_addresses => "10.0.0.20",
         :work_mem => "160MB",
         :effective_io_concurrency => "256",
-        :fsync => "off"
+        :fsync => "on"
       }
     }
   },
   :nominatim => {
-    :state => "off",
+    :state => "standalone",
     :dbcluster => "14/main",
     :postgis => "3",
     :enable_backup => true,
diff --git a/roles/pyrene.rb b/roles/pyrene.rb
index 2d9c8dbfc..ff1b2fc4b 100644
--- a/roles/pyrene.rb
+++ b/roles/pyrene.rb
@@ -56,7 +56,7 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "12/main",
+      :cluster => "14/main",
       :postgis => "3"
     },
     :mapnik => "3.1",