Switch saphira to squid 4

[chef.git] / roles / ascalon.rb

diff --git a/roles/ascalon.rb b/roles/ascalon.rb
index 8bb55527cb48784503fba12dd948ea203f9b59ad..dc3152f5442f04ff1167ba965cc0dc4b5e4fa33b 100644 (file)
--- a/roles/ascalon.rb
+++ b/roles/ascalon.rb
@@ -5,7 +5,7 @@ default_attributes(
   :networking => {
     :interfaces => {
       :external_ipv4 => {
-        :interface => "eth0",
+        :interface => "eno1",
         :role => :external,
         :family => :inet,
         :address => "184.107.48.228",
@@ -15,14 +15,14 @@ default_attributes(
     }
   },
   :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"
+    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
   },
   :tilecache => {
     :tile_parent => "montreal.render.openstreetmap.org",
     :tile_siblings => [
       "stormfly-02.openstreetmap.org",
+      "azure.openstreetmap.org",
       "jakelong.openstreetmap.org"
     ]
   }