Reconfigure ascalon for move to Wolfson House

[chef.git] / roles / nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index 401f1f75596fcdaff28d50ac698f90ce990958da..1c620147253cf76d6b1cf02464cc42388d6f450f 100644 (file)
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -5,7 +5,11 @@ default_attributes(
   :accounts => {
     :users => {
       :lonvia => { :status => :administrator },
-      :twain => { :status => :administrator }
+      :twain => { :status => :administrator },
+      :nominatim => {
+        :status => :role,
+        :members => [ :lonvia, :tomh, :twain ]
+      },
     }
   },
   :apache => {
@@ -13,15 +17,12 @@ default_attributes(
     :timeout => 60,
     :keepalive => false,
     :event => {
-      :max_clients => 560,
-      :threads_per_child => 35
+      :server_limit => 32,
+      :max_clients => 1600,
+      :threads_per_child => 50
     }
   },
-  :apt => {
-    :sources => [ "ubuntugis-stable", "ubuntugis-unstable" ]
-  },
   :postgresql => {
-    :versions => [ "9.1" ],
     :settings => {
       :defaults => {
         :max_connections => "450",
@@ -37,10 +38,21 @@ default_attributes(
     :postgres => {
       :comment => "Increase shared memory for postgres",
       :parameters => { 
-        "kernel.shmmax" => 16 * 1024 * 1024 * 1024,
-        "kernel.shmall" => 16 * 1024 * 1024 * 1024 / 4096
+        "kernel.shmmax" => 26 * 1024 * 1024 * 1024,
+        "kernel.shmall" => 26 * 1024 * 1024 * 1024 / 4096
+      }
+    },
+    :kernel_scheduler_tune => {
+      :comment => "Tune kernel scheduler preempt",
+      :parameters => {
+        "kernel.sched_min_granularity_ns" => 10000000,
+        "kernel.sched_wakeup_granularity_ns" => 15000000
       }
     }
+  },
+  :nominatim => {
+    :enabled => true,
+    :repository => "git://git.openstreetmap.org/nominatim.git"
   }
 )