Fix en.openstreetmap.town container

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index 0f73d7cc40829f5ba4a38924d7997ae940804826..e69ea39ddbfaf839621ab181be369dc0ab0d2770 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -17,58 +17,36 @@ default_attributes(
           :slaves => %w[ens18f0 ens18f1]
         }
       },
           :slaves => %w[ens18f0 ens18f1]
         }
       },

-      :external_cogent => {
-        :interface => "bond0.2",
-        :role => :external,
-        :source_route_table => 100,
-        :inet => {
-          :address => "130.117.76.9",
-          :prefix => "27",
-          :gateway => "130.117.76.1"
-        },
-        :inet6 => {
-          :address => "2001:978:2:2c::172:9",
-          :prefix => "64",
-          :gateway => "2001:978:2:2c::172:1",
-          :routes => {
-            "2001:470:1:b3b::/64" => { :type => "unreachable" }
-          }
-        }
-      },

       :external => {
         :interface => "bond0.3",
         :role => :external,
       :external => {
         :interface => "bond0.3",
         :role => :external,

-        :metric => 150,
-        :source_route_table => 150,

         :inet => {
         :inet => {

-          :address => "184.104.179.137",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.137"

         },
         :inet6 => {
         },
         :inet6 => {

-          :address => "2001:470:1:fa1::9",
-          :prefix => "64",
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:470:1:fa1::9"

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

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

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

-        :fsync => "on",

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

-    :dbcluster => "14/main",
+    :dbcluster => "15/main",

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

+    :api_flavour => "python",
+    :api_workers => 14,
+    :api_pool_size => 10,

     :config => {
       :forward_dependencies => "yes"
     }
     :config => {
       :forward_dependencies => "yes"
     }