X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/793b0ddf8dbbb5a1f6c5014f0fd548c933fb2666..f4e4d77e318f2130d2f410d118a5bd720ece3bbd:/roles/pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index ec99539cd..9f63dd0c0 100644
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -19,10 +19,10 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => [ "9.3" ],
+    :versions => ["9.5"],
     :settings => {
       :defaults => {
-        :shared_buffers => "10GB",
+        :listen_addresses => "10.0.0.20",
         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
@@ -32,23 +32,21 @@ default_attributes(
     }
   },
   :nominatim => {
-    :enabled => true,
-    :database => {
-        :cluster => "9.3/main",
-        :dbname => "nominatim",
-        :postgis => "2.1"
-    },
-    :fpm_pools => {
-        :www => {
-            :port => "8000",
-            :pm => "dynamic",
-            :max_children => "70"
-        },
-        :bulk => {
-            :port => "8001",
-            :pm => "static",
-            :max_children => "10"
-        }
+    :state => "standalone",
+    :dbadmins => %w(lonvia tomh),
+    :dbcluster => "9.5/main",
+    :flatnode_file => "/ssd/nominatim/nodes.store",
+    :tablespaces => {
+      "dosm" => "/ssd/tablespaces/dosm",
+      "iosm" => "/ssd/tablespaces/iosm",
+      "dplace" => "/ssd/tablespaces/dplace",
+      "iplace" => "/ssd/tablespaces/iplace",
+      "daddress" => "/ssd/tablespaces/daddress",
+      "iaddress" => "/ssd/tablespaces/iaddress",
+      "dsearch" => "/ssd/tablespaces/dsearch",
+      "isearch" => "/ssd/tablespaces/isearch",
+      "daux" => "/data/tablespaces/daux",
+      "iaux" => "/data/tablespaces/iaux"
     }
   }
 )