Switch dulcy to use postgres 9.5

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index cad14d6fdc3cc3ddcde63768dcd7a5e6f0d3f533..447f6b5247fa1cb973b174c26540f7fb9b4b9c65 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -1,6 +1,5 @@
 name "dulcy"
 name "dulcy"

-description "Master role applied to dulcy
-"
+description "Master role applied to dulcy"

 
 default_attributes(
   :networking => {
 
 default_attributes(
   :networking => {


@@ -28,7 +27,7 @@ default_attributes(
     }
   },
   :postgresql => {
     }
   },
   :postgresql => {

-    :versions => ["9.4"],
+    :versions => ["9.5"],

     :settings => {
       :defaults => {
         :work_mem => "300MB",
     :settings => {
       :defaults => {
         :work_mem => "300MB",


@@ -44,9 +43,9 @@ default_attributes(
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :logdir => "/ssd/nominatim/log",
     :database => {
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :logdir => "/ssd/nominatim/log",
     :database => {

-      :cluster => "9.4/main",
+      :cluster => "9.5/main",

       :dbname => "nominatim",
       :dbname => "nominatim",

-      :postgis => "2.1"
+      :postgis => "2.2"

     }
   },
   :sysfs => {
     }
   },
   :sysfs => {

diff --git a/roles/nominatim-base.rb b/roles/nominatim-base.rb
index 502627fbce005c9321cfc758faf8fc87a72ccf95..c1ddcaf8c7fb82aeb068284e6f5ac3bf331e3ba0 100644 (file)
--- a/roles/nominatim-base.rb
+++ b/roles/nominatim-base.rb
@@ -22,6 +22,9 @@ default_attributes(
       :threads_per_child => 50
     }
   },
       :threads_per_child => 50
     }
   },

+  :apt => {
+    :sources => ["postgresql"]
+  },

   :postgresql => {
     :settings => {
       :defaults => {
   :postgresql => {
     :settings => {
       :defaults => {

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index 813bc7eaa0f24f4261378c1625c78e313fd91998..9fc103d9e791b6391e2cbe568d91a12e4ef2819e 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -2,9 +2,6 @@ name "pummelzacken"
 description "Master role applied to pummelzacken"
 
 default_attributes(
 description "Master role applied to pummelzacken"
 
 default_attributes(

-  :apt => {
-    :sources => ["postgresql"]
-  },

   :networking => {
     :interfaces => {
       :internal_ipv4 => {
   :networking => {
     :interfaces => {
       :internal_ipv4 => {