Merge pull request #236 from Tigerfell/master

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index df54c29ec6c85d0fdf4c39f16a7afdb3720d0d5a..e431a66455a9efb8ce98f4fb5c65ed6c01a31665 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -5,58 +5,60 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "em1",
+        :interface => "em1.2801",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.20"
       },
       :external_ipv4 => {
-        :interface => "em2",
+        :interface => "em1.2800",
         :role => :external,
         :family => :inet,
-        :address => "128.40.45.204"
+        :address => "193.60.236.18"
       }
     }
   },
   :postgresql => {
+    :versions => ["10"],
     :settings => {
       :defaults => {
         :listen_addresses => "10.0.0.20",
-        :shared_buffers => "10GB",
         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
-        :effective_cache_size => "60GB"
+        :effective_cache_size => "60GB",
+        :fsync => "on"
       }
     }
   },
   :nominatim => {
-    :enabled => true,
+    :state => "standalone",
+    :dbadmins => %w[lonvia tomh],
+    :dbcluster => "10/main",
+    :postgis => "2.4",
+    :enable_backup => true,
     :flatnode_file => "/ssd/nominatim/nodes.store",
-    :database => {
-      :cluster => "9.3/main",
-      :dbname => "nominatim",
-      :postgis => "2.1"
+    :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"
     },
     :fpm_pools => {
       :www => {
-        :port => "8000",
-        :pm => "dynamic",
-        :max_children => "60"
-      },
-      :bulk => {
-        :port => "8001",
-        :pm => "static",
-        :max_children => "10"
+        :max_children => "40"
       }
-    },
-    :redirects => {
-      :reverse => "poldi.openstreetmap.org"
     }
   }
 )
 
 run_list(
-  "role[ucl-wolfson]",
-  "role[nominatim-master]"
+  "role[ucl]",
+  "role[nominatim]"
 )