switch pummelzacken to new nominatim version

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index e3003ed47608750a70fdfa041a0b9cad4d70ee66..b15c5f0133673e79bdd46df7e7ac18082d6199a3 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -31,18 +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[nominatim]"
+  "role[nominatim-base]"
 )