Switch pummelzacken to postgres 9.5

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index 495f2a612e64daf5f84462aa6b17dd3a5b5da7da..e3003ed47608750a70fdfa041a0b9cad4d70ee66 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -19,9 +19,10 @@ default_attributes(
     }
   },
   :postgresql => {
+    :versions => ["9.5"],
     :settings => {
       :defaults => {
-        :shared_buffers => "10GB",
+        :listen_addresses => "10.0.0.20",
         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
@@ -30,29 +31,18 @@ default_attributes(
     }
   },
   :nominatim => {
-    :enabled => true,
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :database => {
       :cluster => "9.3/main",
       :dbname => "nominatim",
       :postgis => "2.1"
     },
-    :fpm_pools => {
-      :www => {
-        :port => "8000",
-        :pm => "dynamic",
-        :max_children => "60"
-      },
-      :bulk => {
-        :port => "8001",
-        :pm => "static",
-        :max_children => "10"
-      }
+    :redirects => {
     }
   }
 )
 
 run_list(
   "role[ucl-wolfson]",
-  "role[nominatim-master]"
+  "role[nominatim]"
 )