X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ac41f3960efc31d10565fa3a79665caeffa421ac..cd8e73ddfbf994bcb238898e5cddaced6681d015:/roles/fafnir.rb

diff --git a/roles/fafnir.rb b/roles/fafnir.rb
index b50e2fc3a..c526226a8 100644
--- a/roles/fafnir.rb
+++ b/roles/fafnir.rb
@@ -2,60 +2,45 @@ name "fafnir"
 description "Master role applied to fafnir"
 
 default_attributes(
-  :db => {
-    :cluster => "9.1/main"
+  :hardware => {
+    :shm_size => "36g"
   },
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
-        :interface => "eth0",
-        :role => :internal,
-        :family => :inet,
-        :address => "172.31.10.210",
-        :hwaddress => "02:c1:c5:8b:5f:1d"
-      },
       :external_ipv4 => {
+        :interface => "enp3s0f0",
         :role => :external,
         :family => :inet,
-        :address => "52.50.86.69"
-      }
-    }
-  },
-  :openvpn => {
-    :address => "10.0.16.4",
-    :tunnels => {
-      :aws2ic => {
-        :port => "1194",
-        :mode => "client",
-        :peer => {
-          :host => "ironbelly.openstreetmap.org",
-          :port => "1195"
-        }
+        :address => "130.239.18.114",
+        :prefix => "27",
+        :gateway => "130.239.18.97"
+      },
+      :external_ipv6 => {
+        :interface => "enp3s0f0",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:6b0:e:2a18::114",
+        :prefix => "64",
+        :gateway => "fe80::5a97:bdff:fe79:dbc0"
       }
     }
   },
-  :postgresql => {
-    :settings => {
-      :defaults => {
-        :shared_buffers => "64GB",
-        :work_mem => "64MB",
-        :maintenance_work_mem => "1GB",
-        :effective_cache_size => "180GB"
-      }
-    }
+  :squid => {
+    :version => 4,
+    :cache_mem => "32768 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"
+    ]
   },
-  :sysctl => {
-    :postgres => {
-      :comment => "Increase shared memory for postgres",
-      :parameters => {
-        "kernel.shmmax" => 66 * 1024 * 1024 * 1024,
-        "kernel.shmall" => 66 * 1024 * 1024 * 1024 / 4096
-      }
-    }
+  :tilecache => {
+    :tile_parent => "sweden.render.openstreetmap.org"
   }
 )
 
 run_list(
-  "role[aws]",
-  "recipe[openvpn]"
+  "role[umu]",
+  "role[tilecache]"
 )