nominatim: remove some dead config options

[chef.git] / roles / drogon.rb

diff --git a/roles/drogon.rb b/roles/drogon.rb
index 57d27ab7de45a8ce2517936920002373e24896a7..8e4e50680d89a3d8c3bab5afe9f4f052dd83873c 100644 (file)
--- a/roles/drogon.rb
+++ b/roles/drogon.rb
@@ -7,6 +7,10 @@ default_attributes(
       :zelja => { :status => :administrator }
     }
   },
+  :hardware => {
+    :shm_size => "18g"
+  },
+  :location => "Osijek, Croatia",
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -25,21 +29,20 @@ default_attributes(
         :prefix => "64",
         :gateway => "fe80::161:53:30:97"
       }
-    },
-    :nameservers => [
-      "161.53.30.100",
-      "8.8.8.8"
-    ]
+    }
   },
   :squid => {
-    :cache_mem => "12500 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :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"
+    ]
   },
   :tilecache => {
-    :tile_parent => "pula.render.openstreetmap.org",
-    :tile_siblings => [
-      "viserion.openstreetmap.org"
-    ]
+    :tile_parent => "osijek.render.openstreetmap.org"
   }
 )