Validate local parts for messages.openstreetmap.org to untaint them

[chef.git] / roles / vhagar.rb

diff --git a/roles/vhagar.rb b/roles/vhagar.rb
index cc431679af373330f7a3229225fe2f3482a86ca5..fc482f3418e6feb41a3cac6d0e39afe746115d2f 100644 (file)
--- a/roles/vhagar.rb
+++ b/roles/vhagar.rb
@@ -4,11 +4,12 @@ description "Master role applied to vhagar"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
+      :internal => {
         :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.48.5",
+        :inet => {
+          :address => "10.0.48.5"
+        },
         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",
@@ -16,28 +17,25 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
-      :external_ipv4 => {
-        :interface => "bond0.2",
+      :external => {
+        :interface => "bond0.3",
         :role => :external,
-        :family => :inet,
-        :address => "130.117.76.5"
-      },
-      :external_ipv6 => {
-        :interface => "bond0.2",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:978:2:2C::172:5"
+        :inet => {
+          :address => "184.104.179.133"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::5"
+        }
       }
     }
   },
   :nominatim => {
     :state => "standalone",
+    :dbcluster => "15/main",
     :flatnode_file => "/srv/nominatim.openstreetmap.org/planet-project/nodes.store",
-    :fpm_pools => {
-      "nominatim.openstreetmap.org" => {
-        :max_children => 200
-      }
-    }
+    :api_flavour => "python",
+    :api_workers => 24,
+    :api_pool_size => 8
   }
 )