X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/9d6b27c56ecc79ef97c209cb865e506dddcf9907..c739082a9748851e2f4242ee846885be5bb89dc2:/roles/pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index 341b87e27..b7ae7b32b 100644
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -11,10 +11,10 @@ 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"
       }
     }
   },
@@ -22,16 +22,18 @@ default_attributes(
     :versions => [ "9.3" ],
     :settings => {
       :defaults => {
-        :shared_buffers => "24GB",
+        :shared_buffers => "10GB",
         :work_mem => "160MB",
-        :maintenance_work_mem => "10GB",
+        :maintenance_work_mem => "20GB",
         :random_page_cost => "1.5",
-        :effective_cache_size => "48GB"
+        :effective_cache_size => "60GB",
+        :fsync => "off"
       }
     }
   },
   :nominatim => {
     :enabled => false,
+    :flatnode_file => "/ssd/nominatim/nodes.store",
     :database => {
         :cluster => "9.3/main",
         :dbname => "nominatim",
@@ -39,18 +41,32 @@ default_attributes(
     },
     :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" => "data",
     }
   }
 )
 
 run_list(
-  "role[ucl-internal]",
+  "role[ucl-wolfson]",
   "role[nominatim]"
 )