Tilecaches: Double default conntrack limit, better handle peaks

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index d13fa65001823a57f2db9d5786b9fc63e6a93d09..9e0de57649aac8a496cd0e60c9819858d5e8f24d 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -9,27 +9,43 @@ default_attributes(
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.20"
+      },
+      :external_ipv4 => {
+        :interface => "p5p2",
+        :role => :external,
+        :family => :inet,
+        :address => "128.40.45.204"
       }
     }
   },
   :postgresql => {
+    :versions => [ "9.3" ],
     :settings => {
       :defaults => {
-        :shared_buffers => "24GB",
+        :shared_buffers => "32GB",
         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
-        :effective_cache_size => "48GB"
+        :effective_cache_size => "60GB",
+        :fsync => "on"
       }
     }
   },
   :nominatim => {
+    :enabled => false,
+    :database => {
+        :cluster => "9.3/main",
+        :dbname => "nominatim",
+        :postgis => "2.1"
+    },
     :fpm_pools => {
         :www => {
+            :port => "8000",
             :pm => "dynamic",
             :max_children => "70"
         },
         :bulk => {
+            :port => "8001",
             :pm => "static",
             :max_children => "10"
         }
@@ -38,5 +54,6 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-internal]"
+  "role[ucl-wolfson]",
+  "role[nominatim]"
 )