Move ridley to chef 12

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index 60bdf4093ae63cb8eca6cbfffe0d0dad3cf3b36b..cae7b6562ef225a84e988c6463bde8b836febb3f 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -19,7 +19,7 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => [ "9.3" ],
+    :versions => ["9.3"],
     :settings => {
       :defaults => {
         :shared_buffers => "10GB",
@@ -32,23 +32,36 @@ default_attributes(
     }
   },
   :nominatim => {
-    :enabled => false,
+    :enabled => true,
+    :flatnode_file => "/ssd/nominatim/nodes.store",
     :database => {
-        :cluster => "9.3/main",
-        :dbname => "nominatim",
-        :postgis => "2.1"
+      :cluster => "9.3/main",
+      :dbname => "nominatim",
+      :postgis => "2.1"
     },
     :fpm_pools => {
-        :www => {
-            :port => "8000",
-            :pm => "dynamic",
-            :max_children => "70"
-        },
-        :bulk => {
-            :port => "8001",
-            :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"
     }
   }
 )