Fix some issues with aggregate graphs

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index b172ce06648d9724cfd4b11aff3d8a87d06b8eab..cae7b6562ef225a84e988c6463bde8b836febb3f 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -9,35 +9,64 @@ default_attributes(
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.20"
+      },
+      :external_ipv4 => {
+        :interface => "em2",
+        :role => :external,
+        :family => :inet,
+        :address => "128.40.45.204"
       }
     }
   },
   :postgresql => {
+    :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 => "60GB",
+        :fsync => "on"
       }
     }
   },
   :nominatim => {
+    :enabled => true,
+    :flatnode_file => "/ssd/nominatim/nodes.store",
+    :database => {
+      :cluster => "9.3/main",
+      :dbname => "nominatim",
+      :postgis => "2.1"
+    },
     :fpm_pools => {
-        :www => {
-            :pm => "dynamic",
-            :max_children => "70"
-        },
-        :bulk => {
-            :pm => "static",
-            :max_children => "10"
-        }
+      :www => {
+        :port => "8000",
+        :pm => "dynamic",
+        :max_children => "70"
+      },
+      :bulk => {
+        :port => "8001",
+        :pm => "static",
+        :max_children => "10"
+      }
+    },
+    :tablespaces => {
+      "Osm2pgsql_Data" => "ssd",
+      "Osm2pgsql_Index" => "ssd",
+      "Place_Data" => "ssd",
+      "Place_Index" => "ssd",
+      "Address_Data" => "ssd",
+      "Address_Index" => "ssd",
+      "Search_Data" => "ssd",
+      "Search_Index" => "ssd",
+      "Aux_Data" => "data",
+      "Aux_Index" => "ssd"
     }
   }
 )
 
 run_list(
-  "role[ucl-internal]",
+  "role[ucl-wolfson]",
   "role[nominatim]"
 )