Switch dulcy to use postgres 9.5

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index 50e4d3b2d9faf705d4200b400c58ed85a593afd7..447f6b5247fa1cb973b174c26540f7fb9b4b9c65 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -1,6 +1,5 @@
 name "dulcy"
-description "Master role applied to dulcy
-"
+description "Master role applied to dulcy"
 
 default_attributes(
   :networking => {
@@ -28,7 +27,7 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["9.4"],
+    :versions => ["9.5"],
     :settings => {
       :defaults => {
         :work_mem => "300MB",
@@ -44,21 +43,9 @@ default_attributes(
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :logdir => "/ssd/nominatim/log",
     :database => {
-      :cluster => "9.4/main",
+      :cluster => "9.5/main",
       :dbname => "nominatim",
-      :postgis => "2.1"
-    },
-    :fpm_pools => {
-      :www => {
-        :port => "8000",
-        :pm => "dynamic",
-        :max_children => "60"
-      },
-      :bulk => {
-        :port => "8001",
-        :pm => "static",
-        :max_children => "10"
-      }
+      :postgis => "2.2"
     }
   },
   :sysfs => {