X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/235dd57874e178a39c006b138772c608f3e19a40..eae9091a7de8aa4ebd28957f9b3837ee2b7496ad:/roles/pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index 5d4647130..ec2ac08b6 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,10 +22,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,31 +34,26 @@ default_attributes(
     }
   },
   :nominatim => {
+    :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"
     },
-    :fpm_pools => {
-      :www => {
-        :port => "8000",
-        :pm => "dynamic",
-        :max_children => "60"
-      },
-      :bulk => {
-        :port => "8001",
-        :pm => "static",
-        :max_children => "10"
-      }
-    },
-    :redirects => {
-      :reverse => "poldi.openstreetmap.org"
-    }
+    :revision => "cmake-port"
   }
 )
 
 run_list(
   "role[ucl-wolfson]",
-  "role[nominatim-master]"
+  "role[nominatim-base]"
 )