Make edit_file work again

[chef.git] / roles / nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index 401f1f75596fcdaff28d50ac698f90ce990958da..4e85a77efc8aa82b937158d440ae8f7ad9fd48d4 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,8 +17,9 @@ default_attributes(
     :timeout => 60,
     :keepalive => false,
     :event => {
-      :max_clients => 560,
-      :threads_per_child => 35
+      :server_limit => 32,
+      :max_clients => 800,
+      :threads_per_child => 50
     }
   },
   :apt => {
@@ -37,10 +42,27 @@ 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
       }
     }
+  },
+  :nominatim => {
+    :repository => "git://git.openstreetmap.org/nominatim.git",
+    :database => {
+        :cluster => "9.1/main",
+        :dbname => "nominatim"
+    },
+    :fpm_pools => {
+        :www => {
+            :pm => "dynamic",
+            :max_children => "50"
+        },
+        :bulk => {
+            :pm => "static",
+            :max_children => "7"
+        }
+    }
   }
 )