Use postgis 2.1 on pummelzacken

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 29726650de6623b271664e561c374ac27bec5200..64e484b39adadcbcca48d720e3d9a5a369bef73f 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -39,6 +39,8 @@ database_cluster = node[:nominatim][:database][:cluster]
 database_version = database_cluster.sub(/\/.*/, "")
 database_name = node[:nominatim][:database][:dbname]
 
+postgis_version = node[:nominatim][:database][:postgis]
+
 service "php5-fpm" do
   action [ :enable, :start ]
   supports :status => true, :restart => true, :reload => true
@@ -108,7 +110,7 @@ package "osmosis"
 package "gcc"
 package "proj-bin"
 package "libgeos-c1"
-package "postgresql-#{database_version}-postgis"
+package "postgresql-#{database_version}-postgis-#{postgis_version}"
 package "postgresql-server-dev-#{database_version}"
 package "build-essential"
 package "libxml2-dev"

diff --git a/roles/poldi.rb b/roles/poldi.rb
index a4af261a2b327fdb36bc130ac0b3a53e5a7166b0..77626ed3893b64b6833890d73221bc6a0e1b18d2 100644 (file)
--- a/roles/poldi.rb
+++ b/roles/poldi.rb
@@ -65,7 +65,8 @@ default_attributes(
   :nominatim => {
     :database => {
         :cluster => "9.1/main",
-        :dbname => "nominatim"
+        :dbname => "nominatim",
+        :postgis => "2.0"
     },
     :fpm_pools => {
         :www => {

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index 053636c9a41d41fe3c9ffd5b200066baef7cfafe..05f6a053929c3ed3c6b89f52aa5e9e16e80914ca 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -27,7 +27,8 @@ default_attributes(
   :nominatim => {
     :database => {
         :cluster => "9.3/main",
-        :dbname => "nominatim"
+        :dbname => "nominatim",
+        :postgis => "2.1"
     },
     :fpm_pools => {
         :www => {