Fix en.openstreetmap.town container

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index 29a4548be815eb42a795fc26a8fe252291eee318..e69ea39ddbfaf839621ab181be369dc0ab0d2770 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -4,65 +4,51 @@ description "Master role applied to dulcy"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

-      :internal_ipv4 => {
+      :internal => {

         :interface => "bond0",
         :role => :internal,
         :interface => "bond0",
         :role => :internal,

-        :family => :inet,
-        :address => "10.0.48.9",
+        :inet => {
+          :address => "10.0.48.9"
+        },

         :bond => {
         :bond => {

+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",

           :slaves => %w[ens18f0 ens18f1]
         }
       },
           :slaves => %w[ens18f0 ens18f1]
         }
       },

-      :external_ipv4 => {
-        :interface => "bond0.2",
+      :external => {
+        :interface => "bond0.3",

         :role => :external,
         :role => :external,

-        :family => :inet,
-        :address => "130.117.76.9"
-      },
-      :external_ipv6 => {
-        :interface => "bond0.2",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:978:2:2C::172:9"
+        :inet => {
+          :address => "184.104.179.137"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::9"
+        }

       }
     }
   },
   :postgresql => {
       }
     }
   },
   :postgresql => {

-    :versions => ["14"],
+    :versions => ["15"],

     :settings => {
       :defaults => {
         :work_mem => "240MB",
     :settings => {
       :defaults => {
         :work_mem => "240MB",

-        :maintenance_work_mem => "10GB",
-        :random_page_cost => "1.5",
-        :effective_cache_size => "60GB",
-        :fsync => "on",

         :effective_io_concurrency => "500"
       }
     }
   },
   :nominatim => {
     :state => "standalone",
         :effective_io_concurrency => "500"
       }
     }
   },
   :nominatim => {
     :state => "standalone",

-    :enable_backup => false,
-    :enable_git_updates => true,
-    :dbadmins => %w[lonvia tomh],
-    :dbcluster => "14/main",
+    :dbcluster => "15/main",

     :postgis => "3",
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :postgis => "3",
     :flatnode_file => "/ssd/nominatim/nodes.store",

-    :config => {
-      :tokenizer => "icu"
-    },

     :logdir => "/ssd/nominatim/log",
     :logdir => "/ssd/nominatim/log",

-    :tablespaces => {
-      "dosm" => "/ssd/tablespaces/dosm",
-      "iosm" => "/ssd/tablespaces/iosm",
-      "dplace" => "/ssd/tablespaces/dplace",
-      "iplace" => "/ssd/tablespaces/iplace",
-      "daddress" => "/ssd/tablespaces/daddress",
-      "iaddress" => "/ssd/tablespaces/iaddress",
-      "dsearch" => "/ssd/tablespaces/dsearch",
-      "isearch" => "/ssd/tablespaces/isearch",
-      "daux" => "/ssd/tablespaces/daux",
-      "iaux" => "/ssd/tablespaces/iaux"
+    :api_flavour => "python",
+    :api_workers => 14,
+    :api_pool_size => 10,
+    :config => {
+      :forward_dependencies => "yes"

     }
   }
 )
     }
   }
 )