Merge remote-tracking branch 'github/pull/464'

[chef.git] / roles / fume.rb

diff --git a/roles/fume.rb b/roles/fume.rb
index 694394c5d5afddd97f6caf230db2924b70578c42..a9cca6869bfb30bce1249f769c3f5f57fb81473b 100644 (file)
--- a/roles/fume.rb
+++ b/roles/fume.rb
@@ -6,6 +6,7 @@ default_attributes(
     :shm_size => "6g"
   },
   :networking => {
     :shm_size => "6g"
   },
   :networking => {

+    :hostname => "seshat.civ.zcu.cz",

     :interfaces => {
       :external_ipv4 => {
         :interface => "ens3",
     :interfaces => {
       :external_ipv4 => {
         :interface => "ens3",


@@ -21,20 +22,14 @@ default_attributes(
     :version => 4,
     :cache_mem => "4096 MB",
     :cache_dir => [
     :version => 4,
     :cache_mem => "4096 MB",
     :cache_dir => [

-      "rock /store/squid/rock-4096 20000 slot-size=4096 max-size=3996",
-      "rock /store/squid/rock-8192 25000 slot-size=8192 min-size=3997 max-size=8092",
-      "rock /store/squid/rock-16384 35000 slot-size=16384 min-size=8093 max-size=16284",
-      "rock /store/squid/rock-32768 45000 slot-size=32768 min-size=16285 max-size=262144"
+      "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"

     ]
   },
   :tilecache => {
     ]
   },
   :tilecache => {

-    :tile_parent => "pilsen.render.openstreetmap.org",
-    :tile_siblings => [
-      "sarkany.openstreetmap.org",
-      "chrysophylax.openstreetmap.org",
-      "drogon.openstreetmap.org",
-      "viserion.openstreetmap.org"
-    ]
+    :tile_parent => "czechia.render.openstreetmap.org"

   }
 )
 
   }
 )