X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3a4d52bd4c0f8e6ae7679145846b7bc7845d8ace..3c3c35ef006e1f86814d5fef5e17dcc9c2aea52c:/roles/pummelzacken.rb?ds=sidebyside

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index 559cb61da..e1b21e67d 100644
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -19,54 +19,38 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => [ "9.3" ],
+    :versions => ["9.3"],
     :settings => {
       :defaults => {
-        :shared_buffers => "10GB",
+        :listen_addresses => "10.0.0.20",
         :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"
     },
-    :fpm_pools => {
-      :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"
+    :redirects => {
+    }
+  },
+  :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]",
-  "role[nominatim]"
+  "role[nominatim-standalone]"
 )