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

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index d7ae5cd6b..b15c5f013 100644
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -19,10 +19,10 @@ default_attributes(
     }
   },
   :postgresql => {
+    :versions => ["9.5"],
     :settings => {
       :defaults => {
         :listen_addresses => "10.0.0.20",
-        :shared_buffers => "10GB",
         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
@@ -31,39 +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"
     },
-    :fpm_pools => {
-      :www => {
-        :port => "8000",
-        :pm => "dynamic",
-        :max_children => "60"
-      },
-      :bulk => {
-        :port => "8001",
-        :pm => "static",
-        :max_children => "10"
-      }
-    },
-    :redirects => {
-      :reverse => "poldi.openstreetmap.org"
-    }
-  },
-  :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-master]"
+  "role[nominatim-base]"
 )