Use mod_proxy_fcgi on 14.04

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index d13fa65001823a57f2db9d5786b9fc63e6a93d09..05f6a053929c3ed3c6b89f52aa5e9e16e80914ca 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,11 @@ default_attributes(
     }
   },
   :nominatim => {
+    :database => {
+        :cluster => "9.3/main",
+        :dbname => "nominatim",
+        :postgis => "2.1"
+    },
     :fpm_pools => {
         :www => {
             :pm => "dynamic",
@@ -38,5 +44,6 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-internal]"
+  "role[ucl-internal]",
+  "role[nominatim]"
 )