Use new style extension initialisation for osmtaginfo

[chef.git] / roles / longma.rb

diff --git a/roles/longma.rb b/roles/longma.rb
index 8de62a5d03f402a8823505d4c5dc47fe5b8c3c29..f8ff9cd871085fde7af8f407d4c064da88c0a24e 100644 (file)
--- a/roles/longma.rb
+++ b/roles/longma.rb
@@ -2,41 +2,61 @@ name "longma"
 description "Master role applied to longma"
 
 default_attributes(
 description "Master role applied to longma"
 
 default_attributes(

-  :exim => {
-    :aliases => {
-      :root => "ceasar"
-    }
-  },

   :networking => {
     :interfaces => {
   :networking => {
     :interfaces => {

+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.64.13",
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[enp68s0f0 enp68s0f1 enp68s0f2 enp68s0f3]
+        }
+      },

       :external_ipv4 => {
       :external_ipv4 => {

-        :interface => "ens160",
+        :interface => "bond0.101",

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

-        :address => "140.110.240.7",
-        :prefix => "24",
-        :gateway => "140.110.240.254"
+        :address => "184.104.226.109"

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

-        :interface => "ens160",
+        :interface => "bond0.101",

         :role => :external,
         :family => :inet6,
         :role => :external,
         :family => :inet6,

-        :address => "2001:e10:2000:240::7",
-        :prefix => "64",
-        :gateway => "2001:e10:2000:240::254"
+        :address => "2001:470:1:b3b::d"

       }
     }
   },
       }
     }
   },

-  :squid => {
-    :cache_mem => "12500 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+  :postgresql => {
+    :versions => ["14"],
+    :settings => {
+      :defaults => {
+        :max_connections => "550",
+        :work_mem => "240MB",
+        :fsync => "on",
+        :effective_io_concurrency => "500"
+      }
+    }

   },
   },

-  :tilecache => {
-    :tile_parent => "hsinchu.render.openstreetmap.org"
+  :nominatim => {
+    :state => "standalone",
+    :dbcluster => "14/main",
+    :postgis => "3",
+    :enable_qa_tiles => true,
+    :flatnode_file => "/ssd/nominatim/nodes.store",
+    :logdir => "/ssd/nominatim/log",
+    :fpm_pools => {
+      "nominatim.openstreetmap.org" => {
+        :max_children => 200
+      }
+    }

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[nchc]",
-  "role[tilecache]"
+  "role[equinix-dub]",
+  "role[nominatim]"

 )
 )