Enable mail handling for UK domains

[chef.git] / roles / poldi.rb

diff --git a/roles/poldi.rb b/roles/poldi.rb
index a4af261a2b327fdb36bc130ac0b3a53e5a7166b0..94b2ea6839eff77b1714f41ad9f196029233682c 100644 (file)
--- a/roles/poldi.rb
+++ b/roles/poldi.rb
@@ -2,6 +2,9 @@ name "poldi"
 description "Master role applied to poldi"
 
 default_attributes(
+  :apt => {
+    :sources => [ "ubuntugis-stable", "ubuntugis-unstable" ]
+  },
   :devices => {
     :areca_ld_tune => {
       :comment => "RAID arrays on areca",
@@ -29,7 +32,7 @@ default_attributes(
     :md_tune => {
       :comment => "Tune the md sync performance so as not to kill system performance",
       :parameters => {
-        "block/md0/md/sync_speed_min" => "100",
+        "block/md0/md/sync_speed_min" => "1",
         "block/md0/md/sync_speed_max" => "100000"
       }
     }
@@ -46,7 +49,7 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.168.106"
+        :address => "128.40.45.203"
       }
     }
   },
@@ -63,36 +66,27 @@ default_attributes(
     }
   },
   :nominatim => {
+    :enabled => false,
     :database => {
         :cluster => "9.1/main",
-        :dbname => "nominatim"
+        :dbname => "nominatim",
+        :postgis => "2.0"
     },
     :fpm_pools => {
         :www => {
             :pm => "dynamic",
-            :max_children => "70"
+            :max_children => "60"
         },
         :bulk => {
             :pm => "static",
             :max_children => "10"
         }
     }
-  },
-  :munin => {
-    :plugins => {
-      :sensors_volt => {
-        :volt6 => {
-          :warning => "2.992:3.536"
-        },
-        :volt10 => {
-          :warning => "2.71:3.29"
-        }
-      }
-    }
   }
 )
 
 run_list(
-  "role[ucl-internal]",
+  "role[ucl-wolfson]",
+  "role[tyan-s7010]",
   "role[nominatim]"
 )