stateofthemap: add reasonable expiry headers

[chef.git] / roles / nepomuk.rb

diff --git a/roles/nepomuk.rb b/roles/nepomuk.rb
index 4c0b7b0b9196934cf8f7900199965bd26c2bbb14..53cd0ef80dccdd8651bcd05973b5922198e6b518 100644 (file)
--- a/roles/nepomuk.rb
+++ b/roles/nepomuk.rb
@@ -3,7 +3,7 @@ description "Master role applied to nepomuk"
 
 default_attributes(
   :hardware => {
 
 default_attributes(
   :hardware => {

-    :shm_size => "14g"
+    :shm_size => "12g"

   },
   :networking => {
     :firewall => {
   },
   :networking => {
     :firewall => {


@@ -50,7 +50,7 @@ default_attributes(
   },
   :squid => {
     :version => 4,
   },
   :squid => {
     :version => 4,

-    :cache_mem => "12288 MB",
+    :cache_mem => "10240 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",
     :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",


@@ -67,15 +67,7 @@ default_attributes(
     }
   },
   :tilecache => {
     }
   },
   :tilecache => {

-    :tile_parent => "france.render.openstreetmap.org",
-    :tile_siblings => [
-      # "necrosan.openstreetmap.org", # IO Overloaded
-      # "nepomuk.openstreetmap.org",
-      "noomoahk.openstreetmap.org",
-      "norbert.openstreetmap.org",
-      "ladon.openstreetmap.org",
-      "gorynych.openstreetmap.org"
-    ]
+    :tile_parent => "france.render.openstreetmap.org"

   }
 )
 
   }
 )