Use postgres 9.3 on pummelzacken

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 44806430032eec74ad8ce650d3565ea7780ac092..29726650de6623b271664e561c374ac27bec5200 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -35,6 +35,10 @@ home_directory = data_bag_item("accounts", "nominatim")["home"]
 source_directory = "#{home_directory}/nominatim"
 email_errors = data_bag_item("accounts", "lonvia")["email"]
 
+database_cluster = node[:nominatim][:database][:cluster]
+database_version = database_cluster.sub(/\/.*/, "")
+database_name = node[:nominatim][:database][:dbname]
+
 service "php5-fpm" do
   action [ :enable, :start ]
   supports :status => true, :restart => true, :reload => true
@@ -47,7 +51,6 @@ apache_site "nominatim.openstreetmap.org" do
 end
 
 node[:nominatim][:fpm_pools].each do |name,data|
-
   template "/etc/php5/fpm/pool.d/#{name}.conf" do
     source "fpm.conf.erb"
     owner "root"
@@ -59,32 +62,32 @@ node[:nominatim][:fpm_pools].each do |name,data|
 end
 
 postgresql_user "tomh" do
-  cluster "9.1/main"
+  cluster database_cluster
   superuser true
 end
 
 postgresql_user "lonvia" do
-  cluster "9.1/main"
+  cluster database_cluster
   superuser true
 end
 
 postgresql_user "twain" do
-  cluster "9.1/main"
+  cluster database_cluster
   superuser true
 end
 
 postgresql_user "nominatim" do
-  cluster "9.1/main"
+  cluster database_cluster
   superuser true
 end
 
 postgresql_user "www-data" do
-  cluster "9.1/main"
+  cluster database_cluster
 end
 
 postgresql_munin "nominatim" do
-  cluster "9.1/main"
-  database "nominatim"
+  cluster database_cluster
+  database database_name
 end
 
 directory "/var/log/nominatim" do
@@ -105,8 +108,8 @@ package "osmosis"
 package "gcc"
 package "proj-bin"
 package "libgeos-c1"
-package "postgresql-9.1-postgis"
-package "postgresql-server-dev-9.1"
+package "postgresql-#{database_version}-postgis"
+package "postgresql-server-dev-#{database_version}"
 package "build-essential"
 package "libxml2-dev"
 package "libgeos-dev"

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index 39289cab7ae3ad4e5e531de6c28cbc223a445e14..c884e2b21b37a0a0fe92c5debf99813822a65ff4 100644 (file)
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -26,7 +26,6 @@ default_attributes(
     :sources => [ "ubuntugis-stable", "ubuntugis-unstable" ]
   },
   :postgresql => {
-    :versions => [ "9.1" ],
     :settings => {
       :defaults => {
         :max_connections => "450",
@@ -55,11 +54,7 @@ default_attributes(
     }
   },
   :nominatim => {
-    :repository => "git://git.openstreetmap.org/nominatim.git",
-    :database => {
-        :cluster => "9.1/main",
-        :dbname => "nominatim"
-    }
+    :repository => "git://git.openstreetmap.org/nominatim.git"
   }
 )
 

diff --git a/roles/poldi.rb b/roles/poldi.rb
index fde01429a6b8808e79aa576dcb09edfdeaea32e1..a4af261a2b327fdb36bc130ac0b3a53e5a7166b0 100644 (file)
--- a/roles/poldi.rb
+++ b/roles/poldi.rb
@@ -51,6 +51,7 @@ default_attributes(
     }
   },
   :postgresql => {
+    :versions => [ "9.1" ],
     :settings => {
       :defaults => {
         :shared_buffers => "24GB",
@@ -62,6 +63,10 @@ default_attributes(
     }
   },
   :nominatim => {
+    :database => {
+        :cluster => "9.1/main",
+        :dbname => "nominatim"
+    },
     :fpm_pools => {
         :www => {
             :pm => "dynamic",

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index b172ce06648d9724cfd4b11aff3d8a87d06b8eab..053636c9a41d41fe3c9ffd5b200066baef7cfafe 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -13,6 +13,7 @@ default_attributes(
     }
   },
   :postgresql => {
+    :versions => [ "9.3" ],
     :settings => {
       :defaults => {
         :shared_buffers => "24GB",
@@ -24,6 +25,10 @@ default_attributes(
     }
   },
   :nominatim => {
+    :database => {
+        :cluster => "9.3/main",
+        :dbname => "nominatim"
+    },
     :fpm_pools => {
         :www => {
             :pm => "dynamic",