switch pummelzacken to new nominatim version

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index d13fa65001823a57f2db9d5786b9fc63e6a93d09..b15c5f0133673e79bdd46df7e7ac18082d6199a3 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -9,34 +9,48 @@ default_attributes(
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.20"
+      },
+      :external_ipv4 => {
+        :interface => "em2",
+        :role => :external,
+        :family => :inet,
+        :address => "128.40.45.204"
       }
     }
   },
   :postgresql => {
+    :versions => ["9.5"],
     :settings => {
       :defaults => {
-        :shared_buffers => "24GB",
+        :listen_addresses => "10.0.0.20",
         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
-        :effective_cache_size => "48GB"
+        :effective_cache_size => "60GB"
       }
     }
   },
   :nominatim => {
-    :fpm_pools => {
-        :www => {
-            :pm => "dynamic",
-            :max_children => "70"
-        },
-        :bulk => {
-            :pm => "static",
-            :max_children => "10"
-        }
-    }
+    :dbadmins => ["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"
+    },
+    :revision => "cmake-port"
   }
 )
 
 run_list(
-  "role[ucl-internal]"
+  "role[ucl-wolfson]",
+  "role[nominatim-base]"
 )