X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/d9ce41963d2a457cffdc34919fcaf865c0275add..bb6a3be37eb6b0de039c6451dcad0fe3bddbf55d:/roles/naga.rb

diff --git a/roles/naga.rb b/roles/naga.rb
index 8045a51f0..5ff6a3588 100644
--- a/roles/naga.rb
+++ b/roles/naga.rb
@@ -2,36 +2,45 @@ name "naga"
 description "Master role applied to naga"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "14g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
         :interface => "ens18",
         :role => :external,
         :family => :inet,
-        :address => "185.216.27.232",
-        :prefix => "24",
-        :gateway => "185.216.27.253"
+        :address => "45.13.104.40",
+        :prefix => "32",
+        :gateway => "10.0.4.1"
+      },
+      :external_ipv6 => {
+        :interface => "ens18",
+        :role => :external,
+        :family => :inet6,
+        :address => "2a0b:cbc0:1101:1::41",
+        :prefix => "64",
+        :gateway => "2a0b:cbc0:1101:1::1"
       }
     }
   },
   :squid => {
-    :cache_mem => "12500 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "10240 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"
+    ]
   },
   :tilecache => {
-    :tile_parent => "france.render.openstreetmap.org",
-    :tile_siblings => [
-      "noomoahk.openstreetmap.org",
-      "nepomuk.openstreetmap.org",
-      "norbert.openstreetmap.org",
-      "necrosan.openstreetmap.org",
-      "ladon.openstreetmap.org",
-      "culebre.openstreetmap.org"
-    ]
+    :tile_parent => "france.render.openstreetmap.org"
   }
 )
 
 run_list(
-  "role[proxgroup]",
+  "role[milkywan]",
   "role[tilecache]"
 )