X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/27eb47e61274ff64620919d6841ae1e17c30dbd1..ee6580d55e1bbed06787ac3e5f18af1bb35c8e6d:/roles/nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index 7798a04e7..bf509ddde 100644
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -8,8 +8,8 @@ default_attributes(
       :twain => { :status => :administrator },
       :nominatim => {
         :status => :role,
-        :members => [ :lonvia, :tomh, :twain ]
-      },
+        :members => [:lonvia, :tomh, :twain]
+      }
     }
   },
   :apache => {
@@ -17,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",
@@ -40,28 +37,40 @@ 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
       }
+    },
+    :kernel_scheduler_tune => {
+      :comment => "Tune kernel scheduler preempt",
+      :parameters => {
+        "kernel.sched_min_granularity_ns" => 10000000,
+        "kernel.sched_wakeup_granularity_ns" => 15000000
+      }
+    },
+    :swappiness => {
+      :comment => "Reduce swap usage",
+      :parameters => {
+        "vm.swappiness" => 10
+      }
+    },
+    :network_conntrack_time_wait => {
+      :comment => "Only track completed connections for 30 seconds",
+      :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"
+      }
     }
   },
   :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"
-        }
-    }
+    :enabled => true,
+    :repository => "git://git.openstreetmap.org/nominatim.git"
   }
 )