X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e947590c6a42789d8a1c240331d85ca637274ed4..bb01eaa9176f18aacc218e8f706f987afd13595e:/roles/nidhogg.rb?ds=inline

diff --git a/roles/nidhogg.rb b/roles/nidhogg.rb
index 004381680..19535d2de 100644
--- a/roles/nidhogg.rb
+++ b/roles/nidhogg.rb
@@ -2,45 +2,65 @@ name "nidhogg"
 description "Master role applied to nidhogg"
 
 default_attributes(
-  :hardware => {
-    :shm_size => "14g"
-  },
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
-        :interface => "ens18",
-        :role => :external,
-        :family => :inet,
-        :address => "130.236.254.221",
-        :prefix => "24",
-        :gateway => "130.236.254.1"
-      },
-      :external_ipv6 => {
-        :interface => "ens18",
+      :external => {
+        :interface => "bond0",
         :role => :external,
-        :family => :inet6,
-        :address => "2001:6b0:17:f0a0::dd",
-        :prefix => "64",
-        :gateway => "2001:6b0:17:f0a0::1"
+        :inet => {
+          :address => "194.71.11.111",
+          :prefix => "25",
+          :gateway => "194.71.11.1"
+        },
+        :inet6 => {
+          :address => "2001:6b0:19:2::111",
+          :prefix => "64",
+          :gateway => "2001:6b0:19:2::1"
+        },
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[enp68s0f0 enp68s0f1 enp68s0f2 enp68s0f3]
+        }
       }
     }
   },
-  :squid => {
-    :version => 4,
-    :cache_mem => "12288 MB",
-    :cache_dir => [
-      "rock /store/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996",
-      "rock /store/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
-      "rock /store/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
-      "rock /store/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
-    ]
+  :postgresql => {
+    :settings => {
+      :defaults => {
+        :shared_buffers => "8GB",
+        :maintenance_work_mem => "7144MB",
+        :effective_cache_size => "16GB"
+      }
+    }
   },
-  :tilecache => {
-    :tile_parent => "sweden.render.openstreetmap.org"
+  :sysctl => {
+    :postgres => {
+      :comment => "Increase shared memory for postgres",
+      :parameters => {
+        "kernel.shmmax" => 9 * 1024 * 1024 * 1024,
+        "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096
+      }
+    }
+  },
+  :tile => {
+    :database => {
+      :cluster => "14/main",
+      :postgis => "3"
+    },
+    :mapnik => "3.1",
+    :styles => {
+      :default => {
+        :tile_directories => [
+          { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
+        ]
+      }
+    }
   }
 )
 
 run_list(
-  "role[lysator]",
-  "role[tilecache]"
+  "role[umu]",
+  "role[tile]"
 )