X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/60792731668f9c32fa491c2bc8f5490ac4125fa0..41811723bfedbbf2a51b5d463978bc992d0d5d96:/roles/dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index 1c90212df..694c84f93 100644
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -4,30 +4,31 @@ description "Master role applied to dulcy"
 default_attributes(
   :networking => {
     :interfaces => {
+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.48.9",
+        :bond => {
+          :slaves => %w[p18p1 p18p2]
+        }
+      },
       :external_ipv4 => {
-        :interface => "p18p1",
+        :interface => "bond0.2",
         :role => :external,
         :family => :inet,
-        :address => "193.63.75.109",
-        :hwaddress => "0c:c4:7a:66:96:d2"
+        :address => "130.117.76.9"
       },
       :external_ipv6 => {
-        :interface => "p18p1",
+        :interface => "bond0.2",
         :role => :external,
         :family => :inet6,
-        :address => "2001:630:12:500:ec4:7aff:fe66:96d2"
-      },
-      :internal_ipv4 => {
-        :interface => "p18p2",
-        :role => :internal,
-        :family => :inet,
-        :address => "146.179.159.179",
-        :hwaddress => "0c:c4:7a:66:96:d3"
+        :address => "2001:978:2:2C::172:9"
       }
     }
   },
   :postgresql => {
-    :versions => ["9.6"],
+    :versions => ["10"],
     :settings => {
       :defaults => {
         :work_mem => "300MB",
@@ -44,7 +45,8 @@ default_attributes(
     :enable_backup => false,
     :enable_git_updates => true,
     :dbadmins => %w[lonvia tomh],
-    :dbcluster => "9.6/main",
+    :dbcluster => "10/main",
+    :postgis => "2.4",
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :logdir => "/ssd/nominatim/log",
     :tablespaces => {
@@ -58,14 +60,6 @@ default_attributes(
       "isearch" => "/ssd/tablespaces/isearch",
       "daux" => "/ssd/tablespaces/daux",
       "iaux" => "/ssd/tablespaces/iaux"
-    },
-    :fpm_pools => {
-      :www => {
-        :max_children => "120"
-      },
-      :bulk => {
-        :max_children => "20"
-      }
     }
   },
   :sysfs => {
@@ -80,6 +74,6 @@ default_attributes(
 )
 
 run_list(
-  "role[ic]",
+  "role[equinix]",
   "role[nominatim]"
 )