X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/956ffe2008afb266d5fa00010e642e8af03c48b0..e02a48d0169202684271b53f818b87796e3f2e6a:/roles/pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index f7a9347b6..e3003ed47 100644
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -19,7 +19,7 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["9.3"],
+    :versions => ["9.5"],
     :settings => {
       :defaults => {
         :listen_addresses => "10.0.0.20",
@@ -37,32 +37,12 @@ default_attributes(
       :dbname => "nominatim",
       :postgis => "2.1"
     },
-    :fpm_pools => {
-      :www => {
-        :port => "8000",
-        :pm => "dynamic",
-        :max_children => "60"
-      },
-      :bulk => {
-        :port => "8001",
-        :pm => "static",
-        :max_children => "10"
-      }
-    },
     :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-standalone]"
+  "role[nominatim]"
 )