Merge remote-tracking branch 'github/pull/467'

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index ba3a3acae4f7a67e38e5fd680c5d419f645f95a0..5ce024ec76e6505c99d40756ac6b2e1b823f33b8 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -25,7 +25,7 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["14"],
+    :versions => ["13"],
     :settings => {
       :defaults => {
         :listen_addresses => "10.0.0.20",
@@ -34,16 +34,10 @@ default_attributes(
         :random_page_cost => "1.5",
         :effective_cache_size => "60GB",
         :effective_io_concurrency => "256",
-        :fsync => "off"
+        :fsync => "on"
       }
     }
   },
-  :apache => {
-    :event => {
-      :max_request_workers => 3000,
-      :threads_per_child => 70
-    }
-  },
   :nominatim => {
     :state => "standalone",
     :dbadmins => %w[lonvia tomh],
@@ -51,6 +45,9 @@ default_attributes(
     :postgis => "3",
     :enable_backup => true,
     :flatnode_file => "/ssd/nominatim/nodes.store",
+    :config => {
+      :tokenizer => "icu"
+    },
     :tablespaces => {
       "dosm" => "/ssd/tablespaces/dosm",
       "iosm" => "/ssd/tablespaces/iosm",