nominatim: add website setup to merge hook

[chef.git] / roles / toothless.rb

diff --git a/roles/toothless.rb b/roles/toothless.rb
index 908807bbe97d7f40f6623425e66edf4077d82963..b96cea8d75dff5b63e92cccc684d2eab1fae425b 100644 (file)
--- a/roles/toothless.rb
+++ b/roles/toothless.rb
@@ -27,7 +27,7 @@ default_attributes(
   },
   :squid => {
     :version => 4,
   },
   :squid => {
     :version => 4,

-    :cache_mem => "3584 MB",
+    :cache_mem => "4096 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",
     :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",


@@ -35,21 +35,19 @@ default_attributes(
       "rock /store/squid/rock-32768 22800 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
     ]
   },
       "rock /store/squid/rock-32768 22800 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
     ]
   },

+  :nginx => {
+    :cache => {
+      :proxy => {
+        :max_size => "16384M"
+      }
+    }
+  },

   :tilecache => {
   :tilecache => {

-    :tile_parent => "london.render.openstreetmap.org",
-    :tile_siblings => [
-      "saphira.openstreetmap.org",
-      "trogdor.openstreetmap.org",
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org",
-      "ridgeback.openstreetmap.org",
-      "gorynych.openstreetmap.org"
-    ]
+    :tile_parent => "london.render.openstreetmap.org"

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

-  "role[geodns]",

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