Tweak tile cache configuration for squid 4

[chef.git] / roles / fume.rb

diff --git a/roles/fume.rb b/roles/fume.rb
index ac5b7ecd4a9f394fd1742b2148eee88191906ece..5ee5ce04eeb4b9d82bd2add37b8d1231a92b072e 100644 (file)
--- a/roles/fume.rb
+++ b/roles/fume.rb
@@ -5,40 +5,37 @@ default_attributes(
   :networking => {
     :interfaces => {
       :external_ipv4 => {
-        :interface => "eth0",
+        :interface => "ens3",
         :role => :external,
         :family => :inet,
-        :address => "85.30.190.241",
-        :prefix => "29",
-        :gateway => "85.30.190.246"
-      },
-      :external_ipv6 => {
-        :interface => "eth0",
-        :role => :external,
-        :family => :inet6,
-        :address => "2a02:80:0:3ff8:222:64ff:fe2a:2714",
-        :prefix => "64"
+        :address => "147.228.60.16",
+        :prefix => "24",
+        :gateway => "147.228.60.1"
       }
     }
   },
   :squid => {
-    :cache_mem => "16000 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "4096 MB",
+    :cache_dir => [
+      "rock /store/squid/rock-4096 20000 slot-size=4096 max-size=3996",
+      "rock /store/squid/rock-8192 25000 slot-size=8192 min-size=3997 max-size=8092",
+      "rock /store/squid/rock-16384 35000 slot-size=16384 min-size=8093 max-size=16284",
+      "rock /store/squid/rock-32768 45000 slot-size=32768 min-size=16285 max-size=262144"
+    ]
   },
-  :sysfs => {
-    :hdd_tune => {
-      :comment => "Tune the queue for improved performance",
-      :parameters => {
-        "block/cciss\!c0d0/queue/nr_requests" => "512",
-        "block/cciss\!c0d1/queue/nr_requests" => "512",
-       "block/cciss\!c0d0/queue/scheduler" => "noop",
-       "block/cciss\!c0d1/queue/scheduler" => "noop"
-      }
-    }
+  :tilecache => {
+    :tile_parent => "pilsen.render.openstreetmap.org",
+    :tile_siblings => [
+      "sarkany.openstreetmap.org",
+      "chrysophylax.openstreetmap.org",
+      "drogon.openstreetmap.org",
+      "viserion.openstreetmap.org"
+    ]
   }
 )
 
 run_list(
-  "role[teleservice]",
+  "role[zcu]",
   "role[tilecache]"
 )