X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/83760b53c07b714c9ed95b5d16c0dd3e8fcfc393..ab47927c016597f8602b81dcdc168ad5c335389d:/roles/ascalon.rb

diff --git a/roles/ascalon.rb b/roles/ascalon.rb
index 426c54abe..9cd93e053 100644
--- a/roles/ascalon.rb
+++ b/roles/ascalon.rb
@@ -2,10 +2,13 @@ name "ascalon"
 description "Master role applied to ascalon"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "20g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
-        :interface => "eth0",
+        :interface => "eno1",
         :role => :external,
         :family => :inet,
         :address => "184.107.48.228",
@@ -15,21 +18,21 @@ default_attributes(
     }
   },
   :squid => {
-    :version => "3",
-    :cache_mem => "16000 MB",
-    :cache_dir => "rock /store/squid/rock-01 128000 swap-timeout=500 max-swap-rate=200 slot-size=4096 max-size=262144"
+    :version => 4,
+    :cache_mem => "16384 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 => "montreal.render.openstreetmap.org",
-    :tile_siblings => [
-      "stormfly-02.openstreetmap.org",
-      "jakelong.openstreetmap.org"
-    ]
+    :tile_parent => "montreal.render.openstreetmap.org"
   }
 )
 
 run_list(
   "role[netalerts]",
-  "role[geodns]",
   "role[tilecache]"
 )