Merge pull request #236 from Tigerfell/master

[chef.git] / roles / ladon.rb

diff --git a/roles/ladon.rb b/roles/ladon.rb
index 68cd92325496587a23edfd68eca162d039d44502..75da422c89adeb73a825be5fb7e526293791d84d 100644 (file)
--- a/roles/ladon.rb
+++ b/roles/ladon.rb
@@ -14,8 +14,8 @@ default_attributes(
         :bond => {
           :mode => "802.3ad",
           :miimon => "100",
-          :xmithashpolixt => "layer3+4",
-          :slaves => %w(eth0 eth1)
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[eth0 eth1]
         }
       },
       :external_ipv6 => {
@@ -27,9 +27,24 @@ default_attributes(
         :gateway => "2001:648:2ffe:4::1"
       }
     }
+  },
+  :squid => {
+    :cache_mem => "6100 MB",
+    :cache_dir => "coss /store/squid/coss-01 80000 block-size=8192 max-size=262144 membufs=80"
+  },
+  :tilecache => {
+    :tile_parent => "athens.render.openstreetmap.org",
+    :tile_siblings => [
+      "trogdor.openstreetmap.org",
+      "katie.openstreetmap.org",
+      "konqi.openstreetmap.org",
+      "ridgeback.openstreetmap.org",
+      "gorynych.openstreetmap.org"
+    ]
   }
 )
 
 run_list(
-  "role[grnet]"
+  "role[grnet]",
+  "role[tilecache]"
 )