X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a5f455cd976b116c1c547d25d0c392166b426ce2..dbada16b30e7355b5d4ae5ee3ad62bf69904dc92:/roles/poldi.rb

diff --git a/roles/poldi.rb b/roles/poldi.rb
index 55d5c038d..cc6a278e4 100644
--- a/roles/poldi.rb
+++ b/roles/poldi.rb
@@ -2,9 +2,6 @@ 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",
@@ -54,59 +51,55 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => [ "9.1" ],
+    :versions => [ "9.3" ],
     :settings => {
       :defaults => {
-        :shared_buffers => "24GB",
+        :shared_buffers => "10GB",
         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
-        :effective_cache_size => "48GB"
+        :effective_cache_size => "48GB",
+        :fsync => "on"
       }
     }
   },
   :nominatim => {
+    :enabled => false,
+    :flatnode_file => "/ssd-old/nominatim/nodes.store",
     :database => {
-        :cluster => "9.1/main",
+        :cluster => "9.3/main",
         :dbname => "nominatim",
-        :postgis => "2.0"
+        :postgis => "2.1"
     },
     :fpm_pools => {
         :www => {
+            :port => "8000",
             :pm => "dynamic",
             :max_children => "60"
         },
         :bulk => {
+            :port => "8001",
             :pm => "static",
             :max_children => "10"
         }
-    }
-  },
-  :munin => {
-    :plugins => {
-      :ipmi_fans => {
-        :Sys3Front1 => { :graph => "no" },
-        :Sys4Front2 => { :graph => "no" },
-        :Sys5Rear1 => { :graph => "no" },
-        :Sys6 => { :graph => "no" },
-        :Sys7 => { :graph => "no" },
-        :Sys8 => { :graph => "no" },
-        :Sys9 => { :graph => "no" },
-        :Sys10 => { :graph => "no" }
-      },
-      :sensors_volt => {
-        :volt6 => {
-          :warning => "2.992:3.536"
-        },
-        :volt10 => {
-          :warning => "2.71:3.29"
-        }
-      }
+    },
+    :tablespaces => {
+        "Osm2pgsql_Data" => "aux",
+        "Osm2pgsql_Index" => "data",
+        "Place_Data" => "ssd2",
+        "Place_Index" => "ssd1",
+        "Address_Data" => "ssd2",
+        "Address_Index" => "ssd1",
+        "Search_Data" => "ssd1",
+        "Search_Index" => "ssd1",
+        "Aux_Data" => "aux",
+        "Aux_Index" => "aux",
     }
   }
 )
 
 run_list(
   "role[ucl-wolfson]",
+  "role[tyan-s7010]",
   "role[nominatim]"
 )