imagery: switch from multiwatch to seperate daemons

[chef.git] / roles / nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index 0aa56aaf40c74e8ed77089ddcad8dfd58bfb7af3..9564e11831d4a3e7ed6689ff490e00c1ae9afb3a 100644 (file)
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -1,5 +1,5 @@
 name "nominatim"
 name "nominatim"

-description "Role applied to all nominatim servers"
+description "Role applied to all nominatim servers."

 
 default_attributes(
   :accounts => {
 
 default_attributes(
   :accounts => {


@@ -8,7 +8,7 @@ default_attributes(
       :twain => { :status => :administrator },
       :nominatim => {
         :status => :role,
       :twain => { :status => :administrator },
       :nominatim => {
         :status => :role,

-        :members => [ :lonvia, :tomh, :twain ]
+        :members => [:lonvia, :tomh, :twain]

       }
     }
   },
       }
     }
   },


@@ -16,10 +16,21 @@ default_attributes(
     :mpm => "event",
     :timeout => 60,
     :keepalive => false,
     :mpm => "event",
     :timeout => 60,
     :keepalive => false,

+    :reqtimeout => true,

     :event => {
       :server_limit => 32,
     :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 => {
     }
   },
   :postgresql => {


@@ -27,9 +38,10 @@ default_attributes(
       :defaults => {
         :max_connections => "450",
         :synchronous_commit => "off",
       :defaults => {
         :max_connections => "450",
         :synchronous_commit => "off",

-        :checkpoint_segments => "50",
+        :checkpoint_segments => "32",

         :checkpoint_timeout => "10min",
         :checkpoint_completion_target => "0.9",
         :checkpoint_timeout => "10min",
         :checkpoint_completion_target => "0.9",

+        :shared_buffers => "2GB",

         :autovacuum_max_workers => "1"
       }
     }
         :autovacuum_max_workers => "1"
       }
     }


@@ -64,16 +76,12 @@ default_attributes(
     :network_conntrack_max => {
       :comment => "Increase max number of connections tracked",
       :parameters => {
     :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(
   }
 )
 
 run_list(

-  "recipe[nominatim]"
+  "recipe[nominatim::default]"

 )
 )