X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/bc24209163a3ebf87300defde4827ac4e7c74cf3..e8c16eea4f5dca742180060e9ade71aacb3ef341:/roles/pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index 3e4ca83cd..b15c5f013 100644
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -19,7 +19,7 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["9.3"],
+    :versions => ["9.5"],
     :settings => {
       :defaults => {
         :listen_addresses => "10.0.0.20",
@@ -31,17 +31,26 @@ default_attributes(
     }
   },
   :nominatim => {
+    :dbadmins => ["lonvia", "tomh"],
+    :dbcluster => "9.5/main",
     :flatnode_file => "/ssd/nominatim/nodes.store",
-    :database => {
-      :cluster => "9.3/main",
-      :dbname => "nominatim",
-      :postgis => "2.1"
+    :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"
     },
-    :redirects => {
-    }
+    :revision => "cmake-port"
   }
 )
 
 run_list(
-  "role[ucl-wolfson]"
+  "role[ucl-wolfson]",
+  "role[nominatim-base]"
 )