From: Guillaume RISCHARD <git@stereo.lu>
Date: Sun, 12 Jan 2020 22:32:07 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.openstreetmap.org/var/lib/git/public/chef
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/04075ae665769fe13b97b5586c46ab28a51cc9d3?hp=4a3ec812708d9fe36bb79bd7ffa1f156e1ab1f8a

Merge branch 'master' of ssh://git.openstreetmap.org/var/lib/git/public/chef
---

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index dfa73f196..afdbd7163 100644
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -39,6 +39,7 @@ node[:networking][:interfaces].each do |name, interface|
       if role[interface[:family]]
         node.normal[:networking][:interfaces][name][:prefix] = role[interface[:family]][:prefix]
         node.normal[:networking][:interfaces][name][:gateway] = role[interface[:family]][:gateway]
+        node.normal[:networking][:interfaces][name][:routes] = role[interface[:family]][:routes]
       end
 
       node.normal[:networking][:interfaces][name][:metric] = role[:metric]
@@ -124,6 +125,20 @@ node[:networking][:interfaces].each do |name, interface|
         )
       end
     end
+
+    if interface[:routes]
+      interface[:routes].each do |to, parameters|
+        route = {
+          "to" => to
+        }
+
+        route["type"] = parameters[:type] if parameters[:type]
+        route["via"] = parameters[:via] if parameters[:via]
+        route["metric"] = parameters[:metric] if parameters[:metric]
+
+        deviceplan["routes"].push(route)
+      end
+    end
   else
     node.rm(:networking, :interfaces, name)
   end
diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index 35c811f35..9ba99a7f4 100644
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -28,7 +28,7 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["10"],
+    :versions => ["12"],
     :settings => {
       :defaults => {
         :work_mem => "300MB",
@@ -36,7 +36,7 @@ default_attributes(
         :random_page_cost => "1.5",
         :effective_cache_size => "60GB",
         :fsync => "on",
-        :effective_io_concurrency => "3"
+        :effective_io_concurrency => "500"
       }
     }
   },
@@ -45,8 +45,8 @@ default_attributes(
     :enable_backup => false,
     :enable_git_updates => true,
     :dbadmins => %w[lonvia tomh],
-    :dbcluster => "10/main",
-    :postgis => "2.4",
+    :dbcluster => "12/main",
+    :postgis => "2.5",
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :logdir => "/ssd/nominatim/log",
     :tablespaces => {
diff --git a/roles/equinix.rb b/roles/equinix.rb
index 9318fb2d0..85b111106 100644
--- a/roles/equinix.rb
+++ b/roles/equinix.rb
@@ -3,8 +3,7 @@ description "Role applied to all servers at Equinix"
 
 default_attributes(
   :networking => {
-    :nameservers => ["8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844"],
-    :dnssec => "no",
+    :nameservers => ["66.28.0.45", "66.28.0.61"],
     :roles => {
       :internal => {
         :inet => {
@@ -20,7 +19,12 @@ default_attributes(
         },
         :inet6 => {
           :prefix => "64",
-          :gateway => "2001:978:2:2C::172:1"
+          :gateway => "2001:978:2:2C::172:1",
+          :routes => {
+            "2001:978:2:2c::/64" => { :type => "unreachable" },
+            "2001:4860::/32" => { :type => "unreachable" },
+            "2a00:1450:4000::/37" => { :type => "unreachable" }
+          }
         }
       }
     }
diff --git a/roles/mail.rb b/roles/mail.rb
index 483260bb0..288eb22d3 100644
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -68,7 +68,8 @@ default_attributes(
       "support" => "support@otrs.openstreetmap.org",
       "memorial" => "communication@osmfoundation.org",
       "legal" => "legal@osmfoundation.org",
-      "dmca" => "dmca@osmfoundation.org"
+      "dmca" => "dmca@osmfoundation.org",
+      "program-sotm" => "sotm-program@otrs.openstreetmap.org"
     },
     :private_aliases => "mail"
   },
diff --git a/roles/otrs.rb b/roles/otrs.rb
index c895b122a..09ec3453e 100644
--- a/roles/otrs.rb
+++ b/roles/otrs.rb
@@ -78,6 +78,15 @@ default_attributes(
         :group => "www-data",
         :home_directory => "/opt/otrs"
       },
+      :otrs_sotm_program => {
+        :comment => "sotm-program@otrs.openstreetmap.org",
+        :domains => ["otrs.openstreetmap.org"],
+        :local_parts => ["sotm-program"],
+        :command => "/opt/otrs/bin/otrs.Console.pl Maint::PostMaster::Read --target-queue 'State of the Map:Program'",
+        :user => "otrs",
+        :group => "www-data",
+        :home_directory => "/opt/otrs"
+      },
       :otrs_support => {
         :comment => "support@otrs.openstreetmap.org",
         :domains => ["otrs.openstreetmap.org"],
diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index 1d96445e7..d237bd053 100644
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -28,12 +28,12 @@ default_attributes(
         :random_page_cost => "1.5",
         :effective_cache_size => "60GB",
         :effective_io_concurrency => "256",
-        :fsync => "off"
+        :fsync => "on"
       }
     }
   },
   :nominatim => {
-    :state => "off",
+    :state => "standalone",
     :dbadmins => %w[lonvia tomh],
     :dbcluster => "12/main",
     :postgis => "2.5",