ramoth: remove ghes.disable=1 param

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index d69d5c64432c27d8ebbb2a5ddadbe9085affb549..5d4647130748794fbae198049ccf6d11b460d664 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -19,54 +19,43 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => [ "9.3" ],
     :settings => {
       :defaults => {
+        :listen_addresses => "10.0.0.20",
         :shared_buffers => "10GB",
         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
-        :effective_cache_size => "60GB",
-        :fsync => "on"
+        :effective_cache_size => "60GB"
       }
     }
   },
   :nominatim => {
-    :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 => "60"
+      },
+      :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" => "data",
+    :redirects => {
+      :reverse => "poldi.openstreetmap.org"
     }
   }
 )
 
 run_list(
   "role[ucl-wolfson]",
-  "role[nominatim]"
+  "role[nominatim-master]"
 )