Fix php requires and reapply nominatim role to dulcy

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index f7a9347b63f3fa37630870a7a74cc8ef107ad3dc..9fc103d9e791b6391e2cbe568d91a12e4ef2819e 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -19,7 +19,7 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["9.3"],
+    :versions => ["9.5"],
     :settings => {
       :defaults => {
         :listen_addresses => "10.0.0.20",
@@ -31,38 +31,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"
     },
-    :fpm_pools => {
-      :www => {
-        :port => "8000",
-        :pm => "dynamic",
-        :max_children => "60"
-      },
-      :bulk => {
-        :port => "8001",
-        :pm => "static",
-        :max_children => "10"
-      }
-    },
-    :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]"
 )