X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/8f0fd75fb31e809fcf4134fd9ec700f21721e896..855cc205f5ead237914ad554430f906f73a01e69:/roles/longma.rb

diff --git a/roles/longma.rb b/roles/longma.rb
index 842cf1a82..a3502c6df 100644
--- a/roles/longma.rb
+++ b/roles/longma.rb
@@ -8,7 +8,7 @@ default_attributes(
     }
   },
   :hardware => {
-    :shm_size => "18g"
+    :shm_size => "20g"
   },
   :networking => {
     :interfaces => {
@@ -34,26 +34,22 @@ default_attributes(
     :version => 4,
     :cache_mem => "16384 MB",
     :cache_dir => [
-      "rock /store/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996",
-      "rock /store/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
-      "rock /store/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
-      "rock /store/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
+      "rock /store.new-san/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996",
+      "rock /store.new-san/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
+      "rock /store.new-san/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
+      "rock /store.new-san/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
     ]
   },
   :nginx => {
     :cache => {
       :proxy => {
-        :directory => "/store/nginx-cache/proxy-cache"
+        :directory => "/store.new-san/nginx-cache/proxy-cache",
+        :max_size => "65536M"
       }
     }
   },
   :tilecache => {
-    :tile_parent => "hsinchu.render.openstreetmap.org",
-    :tile_siblings => [
-      "balerion.openstreetmap.org",
-      "waima.openstreetmap.org",
-      "tuatara.openstreetmap.org"
-    ]
+    :tile_parent => "hsinchu.render.openstreetmap.org"
   }
 )