X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/586bf07eb0c3f1cdf6f5afcea9bd7ea81cde8564..6067e264a06f3714bc6096dd26400174aecb65fd:/roles/naga.rb

diff --git a/roles/naga.rb b/roles/naga.rb
index 009a3ea7f..664510b1f 100644
--- a/roles/naga.rb
+++ b/roles/naga.rb
@@ -2,45 +2,37 @@ name "naga"
 description "Master role applied to naga"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "38g"
+  },
   :networking => {
-    :netplan => true,
     :interfaces => {
       :external_ipv4 => {
-        :interface => "ens18",
+        :interface => "eno1",
         :role => :external,
         :family => :inet,
-        :address => "185.216.27.232",
-        :prefix => "24",
-        :gateway => "185.216.27.253"
-      },
-      :external_ipv6 => {
-        :interface => "ens18",
-        :role => :external,
-        :family => :inet6,
-        :address => "2a07:abc4:5::27:244",
+        :address => "185.116.130.151",
         :prefix => "24",
-        :gateway => "fe80::20c:29ff:fe4d:941b"
+        :gateway => "185.116.130.151"
       }
     }
   },
   :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 => "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"
+    ]
   },
   :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[fullsave]",
   "role[tilecache]"
 )