Fix backup expiry script to match prefixes correctly

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index aa31fc60bd4d35f71e0a3ea979c2f35dd3fd84ba..b3f864c6a08ad7f3a133d1bed341f0680b5df3a4 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -1,34 +1,52 @@
 name "dulcy"
 name "dulcy"

-description "Master role applied to dulcy
-"
+description "Master role applied to dulcy"

 
 default_attributes(
   :networking => {
     :interfaces => {
 
 default_attributes(
   :networking => {
     :interfaces => {

+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.48.9",
+        :bond => {
+          :slaves => %w[ens18f0 ens18f1]
+        }
+      },

       :external_ipv4 => {
       :external_ipv4 => {

-        :interface => "p18p1",
+        :interface => "bond0.2",

         :role => :external,
         :family => :inet,
         :role => :external,
         :family => :inet,

-        :address => "193.63.75.109",
-        :hwaddress => "0c:c4:7a:66:96:d2"
+        :address => "130.117.76.9"

       },
       :external_ipv6 => {
       },
       :external_ipv6 => {

-        :interface => "p18p1",
+        :interface => "bond0.2",

         :role => :external,
         :family => :inet6,
         :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 => ["14"],
+    :settings => {
+      :defaults => {
+        :work_mem => "240MB",
+        :fsync => "on",
+        :effective_io_concurrency => "500"

       }
     }
       }
     }

+  },
+  :nominatim => {
+    :state => "standalone",
+    :dbcluster => "14/main",
+    :postgis => "3",
+    :flatnode_file => "/ssd/nominatim/nodes.store",
+    :logdir => "/ssd/nominatim/log"

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[ic]"
+  "role[equinix-ams]",
+  "role[nominatim]"

 )
 )