Use postgis 2.1 on pummelzacken

[chef.git] / roles / poldi.rb

diff --git a/roles/poldi.rb b/roles/poldi.rb
index f340d82e081ae382579c396a4903a3a675048d80..77626ed3893b64b6833890d73221bc6a0e1b18d2 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,10 +63,15 @@ default_attributes(
     }
   },
   :nominatim => {
+    :database => {
+        :cluster => "9.1/main",
+        :dbname => "nominatim",
+        :postgis => "2.0"
+    },
     :fpm_pools => {
         :www => {
             :pm => "dynamic",
-            :max_children => "80"
+            :max_children => "70"
         },
         :bulk => {
             :pm => "static",
@@ -78,6 +84,9 @@ default_attributes(
       :sensors_volt => {
         :volt6 => {
           :warning => "2.992:3.536"
+        },
+        :volt10 => {
+          :warning => "2.71:3.29"
         }
       }
     }