X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/56d96508993293278dfd1ee741c39e5ea880f2b3..47fb3dfbb9fcbd6325d43796c91ebdc2b632c6b1:/roles/pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index e1b21e67d..813bc7eaa 100644
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -2,6 +2,9 @@ name "pummelzacken"
 description "Master role applied to pummelzacken"
 
 default_attributes(
+  :apt => {
+    :sources => ["postgresql"]
+  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
@@ -19,7 +22,7 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["9.3"],
+    :versions => ["9.5"],
     :settings => {
       :defaults => {
         :listen_addresses => "10.0.0.20",
@@ -31,26 +34,27 @@ default_attributes(
     }
   },
   :nominatim => {
+    :state => "standalone",
+    :dbadmins => %w(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 => {
-    }
-  },
-  :hardware => {
-    :grub => {
-      # lock kernel to 3.16.0-46 due to some issue with igb driver
-      # see https://github.com/openstreetmap/operations/issues/45
-      # for more information.
-      :kernel => "3.16.0-46"
-    }
+    :revision => "cmake-port"
   }
 )
 
 run_list(
   "role[ucl-wolfson]",
-  "role[nominatim-standalone]"
+  "role[nominatim-base]"
 )