X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/dbfe66d5c438af1b566ace0704631f40ae7cc050..ceef1ce352d360a90b6b2d672f9b7d424d866e25:/roles/pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index bf19f54e2..9f63dd0c0 100644
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -11,49 +11,47 @@ default_attributes(
         :address => "10.0.0.20"
       },
       :external_ipv4 => {
-        :interface => "p5p2",
+        :interface => "em2",
         :role => :external,
         :family => :inet,
-        :address => "128.40.168.105"
+        :address => "128.40.45.204"
       }
     }
   },
   :postgresql => {
-    :versions => [ "9.3" ],
+    :versions => ["9.5"],
     :settings => {
       :defaults => {
-        :shared_buffers => "32GB",
+        :listen_addresses => "10.0.0.20",
         :work_mem => "160MB",
-        :maintenance_work_mem => "20GB",
+        :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
         :effective_cache_size => "60GB",
-        :fsync => "off"
+        :fsync => "on"
       }
     }
   },
   :nominatim => {
-    :enabled => false,
-    :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"
-        }
+    :state => "standalone",
+    :dbadmins => %w(lonvia tomh),
+    :dbcluster => "9.5/main",
+    :flatnode_file => "/ssd/nominatim/nodes.store",
+    :tablespaces => {
+      "dosm" => "/ssd/tablespaces/dosm",
+      "iosm" => "/ssd/tablespaces/iosm",
+      "dplace" => "/ssd/tablespaces/dplace",
+      "iplace" => "/ssd/tablespaces/iplace",
+      "daddress" => "/ssd/tablespaces/daddress",
+      "iaddress" => "/ssd/tablespaces/iaddress",
+      "dsearch" => "/ssd/tablespaces/dsearch",
+      "isearch" => "/ssd/tablespaces/isearch",
+      "daux" => "/data/tablespaces/daux",
+      "iaux" => "/data/tablespaces/iaux"
     }
   }
 )
 
 run_list(
-  "role[ucl-wates]",
+  "role[ucl-wolfson]",
   "role[nominatim]"
 )