move pummelzacken to master version of nominatim

[chef.git] / roles / nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index f0f2a2dc39edac3fb601e8001c48e536611d8b6a..6e2a75ce4bb337acdbbfb9647ddf0720c8da2497 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 => {
@@ -8,8 +8,8 @@ default_attributes(
       :twain => { :status => :administrator },
       :nominatim => {
         :status => :role,
-        :members => [ :lonvia, :tomh, :twain ]
-      },
+        :members => [:lonvia, :tomh, :twain]
+      }
     }
   },
   :apache => {
@@ -22,14 +22,18 @@ default_attributes(
       :threads_per_child => 50
     }
   },
+  :apt => {
+    :sources => ["postgresql"]
+  },
   :postgresql => {
     :settings => {
       :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"
       }
     }
@@ -37,7 +41,7 @@ default_attributes(
   :sysctl => {
     :postgres => {
       :comment => "Increase shared memory for postgres",
-      :parameters => { 
+      :parameters => {
         "kernel.shmmax" => 26 * 1024 * 1024 * 1024,
         "kernel.shmall" => 26 * 1024 * 1024 * 1024 / 4096
       }
@@ -57,23 +61,19 @@ default_attributes(
     },
     :network_conntrack_time_wait => {
       :comment => "Only track completed connections for 30 seconds",
-      :parameters => { 
+      :parameters => {
         "net.netfilter.nf_conntrack_tcp_timeout_time_wait" => "30"
       }
     },
     :network_conntrack_max => {
       :comment => "Increase max number of connections tracked",
       :parameters => {
-         "net.netfilter.nf_conntrack_max" => "131072"
+        "net.netfilter.nf_conntrack_max" => "131072"
       }
     }
-  },
-  :nominatim => {
-    :enabled => true,
-    :repository => "git://git.openstreetmap.org/nominatim.git"
   }
 )
 
 run_list(
-  "recipe[nominatim]"
+  "recipe[nominatim::default]"
 )