X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/d3020dfb2e4892dd734b2061dbd0c46675d3ba39..252f39e174aa5f88b1ddb5896e593fcc3818ed40:/roles/nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index 8e3ed5d0b..5ab242997 100644
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -18,15 +18,11 @@ default_attributes(
     :keepalive => false,
     :event => {
       :server_limit => 32,
-      :max_clients => 800,
+      :max_clients => 1600,
       :threads_per_child => 50
     }
   },
-  :apt => {
-    :sources => [ "ubuntugis-stable", "ubuntugis-unstable" ]
-  },
   :postgresql => {
-    :versions => [ "9.1" ],
     :settings => {
       :defaults => {
         :max_connections => "450",
@@ -52,23 +48,28 @@ default_attributes(
         "kernel.sched_min_granularity_ns" => 10000000,
         "kernel.sched_wakeup_granularity_ns" => 15000000
       }
+    },
+    :swappiness => {
+      :comment => "Reduce swap usage",
+      :parameters => {
+        "vm.swappiness" => 10
+      }
     }
   },
   :nominatim => {
+    :enabled => true,
     :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"
-        }
+    :tablespaces => {
+        "Osm2pgsql_Data" => "aux",
+        "Osm2pgsql_Index" => "data",
+        "Place_Data" => "ssd2",
+        "Place_Index" => "ssd1",
+        "Address_Data" => "ssd2",
+        "Address_Index" => "ssd1",
+        "Search_Data" => "ssd1",
+        "Search_Index" => "ssd1",
+        "Aux_Data" => "aux",
+        "Aux_Index" => "aux",
     }
   }
 )