From 237631e34f8bf03cef94d0a1571657b0061cf0bc Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Fri, 30 Sep 2016 19:12:05 +0100
Subject: [PATCH] Switch dulcy to use postgres 9.5

---
 roles/dulcy.rb          | 9 ++++-----
 roles/nominatim-base.rb | 3 +++
 roles/pummelzacken.rb   | 3 ---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index cad14d6fd..447f6b524 100644
--- 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,9 +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"
+      :postgis => "2.2"
     }
   },
   :sysfs => {
diff --git a/roles/nominatim-base.rb b/roles/nominatim-base.rb
index 502627fbc..c1ddcaf8c 100644
--- a/roles/nominatim-base.rb
+++ b/roles/nominatim-base.rb
@@ -22,6 +22,9 @@ default_attributes(
       :threads_per_child => 50
     }
   },
+  :apt => {
+    :sources => ["postgresql"]
+  },
   :postgresql => {
     :settings => {
       :defaults => {
diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index 813bc7eaa..9fc103d9e 100644
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -2,9 +2,6 @@ name "pummelzacken"
 description "Master role applied to pummelzacken"
 
 default_attributes(
-  :apt => {
-    :sources => ["postgresql"]
-  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-- 
2.39.5