Add new Amsterdam IPv6 addresses to ACLs

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index bc251288181b27ebac5f51e650db2acc17dce4b7..a3af500778c79270fd79cc33262ad8482c1f0b71 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -4,51 +4,57 @@ 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 => {
           :mode => "802.3ad",
           :lacprate => "fast",
           :xmithashpolicy => "layer3+4",
         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",
           :xmithashpolicy => "layer3+4",

-          :slaves => %w[ens18f0 ens18f1]
+          :slaves => %w[enp1s0f0 enp1s0f1]

         }
       },
         }
       },

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

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

-        :family => :inet,
-        :address => "130.117.76.9"
+        :metric => 150,
+        :source_route_table => 100,
+        :inet => {
+          :address => "184.104.179.137",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        }

       },
       },

-      :external_ipv6 => {
-        :interface => "bond0.2",
+      :external => {
+        :interface => "bond0.103",

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

-        :family => :inet6,
-        :address => "2001:978:2:2C::172:9"
+        :source_route_table => 150,
+        :inet => {
+          :address => "82.199.86.105",
+          :prefix => "27",
+          :gateway => "82.199.86.97"
+        }

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

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

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

-        :fsync => "on",

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

-    :state => "standalone",
-    :dbcluster => "14/main",
-    :postgis => "3",
-    :flatnode_file => "/ssd/nominatim/nodes.store",
-    :logdir => "/ssd/nominatim/log",
-    :config => {
-      :forward_dependencies => "yes"
-    }
+    :dbcluster => "17/main",
+    :flatnode_file => "/srv/nominatim.openstreetmap.org/planet-project/nodes.store",
+    :enable_qa_tiles => true,
+    :api_workers => 14,
+    :api_pool_size => 10

   }
 )
 
   }
 )