imagery: fix paths

[chef.git] / roles / jakelong.rb

diff --git a/roles/jakelong.rb b/roles/jakelong.rb
index 4eff9e02a8a3184ddb18a7841b36d87fac0c2914..945bdd52fcb17a55eb64deee7d7898ec524da4aa 100644 (file)
--- a/roles/jakelong.rb
+++ b/roles/jakelong.rb
@@ -2,6 +2,9 @@ name "jakelong"
 description "Master role applied to jakelong"
 
 default_attributes(
 description "Master role applied to jakelong"
 
 default_attributes(

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

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


@@ -23,12 +26,19 @@ default_attributes(
     }
   },
   :squid => {
     }
   },
   :squid => {

+    :version => 4,

     :cache_mem => "1024 MB",
     :cache_mem => "1024 MB",

-    :cache_dir => "coss /store/squid/coss-01 24000 block-size=8192 max-size=262144 membufs=30"
+    :cache_dir => [
+      "rock /store/squid/rock-4096 3840 swap-timeout=200 slot-size=4096 max-size=3996",
+      "rock /store/squid/rock-8192 4800 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
+      "rock /store/squid/rock-16384 6720 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
+      "rock /store/squid/rock-32768 8640 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
+    ]

   },
   :nginx => {
     :cache => {
       :proxy => {
   },
   :nginx => {
     :cache => {
       :proxy => {

+        :keys_zone => "proxy_cache_zone:64M",

         :max_size => "2048M"
       }
     }
         :max_size => "2048M"
       }
     }


@@ -49,18 +59,11 @@ default_attributes(
     }
   },
   :tilecache => {
     }
   },
   :tilecache => {

-    :tile_parent => "sanfrancisco.render.openstreetmap.org",
-    :tile_siblings => [
-      "stormfly-02.openstreetmap.org",
-      "ascalon.openstreetmap.org",
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org"
-    ]
+    :tile_parent => "sanfrancisco.render.openstreetmap.org"

   }
 )
 
 run_list(
   "role[prgmr]",
   }
 )
 
 run_list(
   "role[prgmr]",

-  "role[geodns]",

   "role[tilecache]"
 )
   "role[tilecache]"
 )