Switch necrosan, nepomuk, noomoahk and norbert to squid 4

[chef.git] / roles / angor.rb

diff --git a/roles/angor.rb b/roles/angor.rb
index da5d426cee6bc820d5e27631c07cbd00aec9a285..e29127eed6f2d86646758201960eedfade80f86c 100644 (file)
--- a/roles/angor.rb
+++ b/roles/angor.rb
@@ -2,6 +2,9 @@ name "angor"
 description "Master role applied to angor"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "18g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -23,13 +26,18 @@ default_attributes(
     }
   },
   :squid => {
-    :cache_mem => "6100 MB",
-    :cache_dir => "coss /store/squid/coss-01 80000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "16384 MB",
+    :cache_dir => [
+      "rock /store/squid/rock-4096 12800 swap-timeout=200 slot-size=4096 max-size=3996",
+      "rock /store/squid/rock-8192 16000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
+      "rock /store/squid/rock-16384 22400 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
+      "rock /store/squid/rock-32768 22800 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
+    ]
   },
   :tilecache => {
-    :tile_parent => "london.render.openstreetmap.org",
+    :tile_parent => "capetown.render.openstreetmap.org",
     :tile_siblings => [
-      "trogdor.openstreetmap.org",
       "katie.openstreetmap.org",
       "konqi.openstreetmap.org",
       "ridgeback.openstreetmap.org",
@@ -39,5 +47,7 @@ default_attributes(
 )
 
 run_list(
-  "role[inxza]"
+  "role[inxza]",
+  "role[tilecache]",
+  "role[ftp]"
 )