Switch boitata and cherufe to squid 4

[chef.git] / roles / ascalon.rb

diff --git a/roles/ascalon.rb b/roles/ascalon.rb
index 8bb55527cb48784503fba12dd948ea203f9b59ad..481fc50e2bddd042c685e89b6934699376df10c8 100644 (file)
--- a/roles/ascalon.rb
+++ b/roles/ascalon.rb
@@ -2,10 +2,13 @@ name "ascalon"
 description "Master role applied to ascalon"
 
 default_attributes(
 description "Master role applied to ascalon"
 
 default_attributes(

+  :hardware => {
+    :shm_size => "18g"
+  },

   :networking => {
     :interfaces => {
       :external_ipv4 => {
   :networking => {
     :interfaces => {
       :external_ipv4 => {

-        :interface => "eth0",
+        :interface => "eno1",

         :role => :external,
         :family => :inet,
         :address => "184.107.48.228",
         :role => :external,
         :family => :inet,
         :address => "184.107.48.228",


@@ -15,14 +18,20 @@ default_attributes(
     }
   },
   :squid => {
     }
   },
   :squid => {

-    :version => "3",
-    :cache_mem => "16000 MB",
-    :cache_dir => "rock /store/squid/rock-01 128000 swap-timeout=300 max-swap-rate=50 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",
   },
   :tilecache => {
     :tile_parent => "montreal.render.openstreetmap.org",
     :tile_siblings => [
       "stormfly-02.openstreetmap.org",

+      "azure.openstreetmap.org",

       "jakelong.openstreetmap.org"
     ]
   }
       "jakelong.openstreetmap.org"
     ]
   }