move nominatim traffic back to poldi/pummelzacken

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index cae7b6562ef225a84e988c6463bde8b836febb3f..c6e7d9f582b9a19c283f655257ba24914d503c14 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -19,20 +19,17 @@ default_attributes(
     }
   },
   :postgresql => {
     }
   },
   :postgresql => {

-    :versions => ["9.3"],

     :settings => {
       :defaults => {
     :settings => {
       :defaults => {

-        :shared_buffers => "10GB",
+        :listen_addresses => "10.0.0.20",

         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",

-        :effective_cache_size => "60GB",
-        :fsync => "on"
+        :effective_cache_size => "60GB"

       }
     }
   },
   :nominatim => {
       }
     }
   },
   :nominatim => {

-    :enabled => true,

     :flatnode_file => "/ssd/nominatim/nodes.store",
     :database => {
       :cluster => "9.3/main",
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :database => {
       :cluster => "9.3/main",


@@ -43,7 +40,7 @@ default_attributes(
       :www => {
         :port => "8000",
         :pm => "dynamic",
       :www => {
         :port => "8000",
         :pm => "dynamic",

-        :max_children => "70"
+        :max_children => "60"

       },
       :bulk => {
         :port => "8001",
       },
       :bulk => {
         :port => "8001",


@@ -51,22 +48,21 @@ default_attributes(
         :max_children => "10"
       }
     },
         :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"
+    :redirects => {
+      :reverse => "poldi.openstreetmap.org"
+    }
+  },
+  :hardware => {
+    :grub => {
+      # lock kernel to 3.16.0-46 due to some issue with igb driver
+      # see https://github.com/openstreetmap/operations/issues/45
+      # for more information.
+      :kernel => "3.16.0-46"

     }
   }
 )
 
 run_list(
   "role[ucl-wolfson]",
     }
   }
 )
 
 run_list(
   "role[ucl-wolfson]",

-  "role[nominatim]"
+  "role[nominatim-master]"

 )
 )