put pummelzacken in production mode

[chef.git] / roles / nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index 86a2fe9cd23552bcf98081c71e3d45009ac39fc1..9564e11831d4a3e7ed6689ff490e00c1ae9afb3a 100644 (file)
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -1,5 +1,5 @@
 name "nominatim"
-description "Role applied to all nominatim servers"
+description "Role applied to all nominatim servers."
 
 default_attributes(
   :accounts => {
@@ -16,10 +16,21 @@ default_attributes(
     :mpm => "event",
     :timeout => 60,
     :keepalive => false,
+    :reqtimeout => true,
     :event => {
       :server_limit => 32,
-      :max_clients => 1600,
-      :threads_per_child => 50
+      :max_request_workers => 1600,
+      :threads_per_child => 50,
+      :min_spare_threads => 125,
+      :max_spare_threads => 925
+    }
+  },
+  :apt => {
+    :sources => ["postgresql"]
+  },
+  :networking => {
+    :firewall => {
+      :http_rate_limit => "s:7/sec:15"
     }
   },
   :postgresql => {
@@ -27,9 +38,10 @@ default_attributes(
       :defaults => {
         :max_connections => "450",
         :synchronous_commit => "off",
-        :checkpoint_segments => "50",
+        :checkpoint_segments => "32",
         :checkpoint_timeout => "10min",
         :checkpoint_completion_target => "0.9",
+        :shared_buffers => "2GB",
         :autovacuum_max_workers => "1"
       }
     }
@@ -67,25 +79,9 @@ default_attributes(
         "net.netfilter.nf_conntrack_max" => "131072"
       }
     }
-  },
-  :nominatim => {
-    :enabled => true,
-    :repository => "git://git.openstreetmap.org/nominatim.git",
-    :tablespaces => {
-      "Osm2pgsql_Data" => "data",
-      "Osm2pgsql_Index" => "data",
-      "Place_Data" => "data",
-      "Place_Index" => "ssd2",
-      "Address_Data" => "data",
-      "Address_Index" => "ssd2",
-      "Search_Data" => "ssd1",
-      "Search_Index" => "ssd1",
-      "Aux_Data" => "aux",
-      "Aux_Index" => "aux"
-    }
   }
 )
 
 run_list(
-  "recipe[nominatim]"
+  "recipe[nominatim::default]"
 )