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

[chef.git] / roles / longma.rb

diff --git a/roles/longma.rb b/roles/longma.rb
index a8380824ff5238ea156c2e47af00241801e175e8..f8ff9cd871085fde7af8f407d4c064da88c0a24e 100644 (file)
--- a/roles/longma.rb
+++ b/roles/longma.rb
@@ -34,38 +34,24 @@ default_attributes(
     :versions => ["14"],
     :settings => {
       :defaults => {
     :versions => ["14"],
     :settings => {
       :defaults => {

+        :max_connections => "550",

         :work_mem => "240MB",
         :work_mem => "240MB",

-        :maintenance_work_mem => "10GB",
-        :random_page_cost => "1.5",
-        :effective_cache_size => "60GB",
-        :fsync => "off",
+        :fsync => "on",

         :effective_io_concurrency => "500"
       }
     }
   },
   :nominatim => {
     :state => "standalone",
         :effective_io_concurrency => "500"
       }
     }
   },
   :nominatim => {
     :state => "standalone",

-    :enable_backup => false,
-    :enable_git_updates => true,
-    :dbadmins => %w[lonvia tomh],

     :dbcluster => "14/main",
     :postgis => "3",
     :dbcluster => "14/main",
     :postgis => "3",

+    :enable_qa_tiles => true,

     :flatnode_file => "/ssd/nominatim/nodes.store",
     :flatnode_file => "/ssd/nominatim/nodes.store",

-    :config => {
-      :tokenizer => "icu"
-    },

     :logdir => "/ssd/nominatim/log",
     :logdir => "/ssd/nominatim/log",

-    :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" => "/ssd/tablespaces/daux",
-      "iaux" => "/ssd/tablespaces/iaux"
+    :fpm_pools => {
+      "nominatim.openstreetmap.org" => {
+        :max_children => 200
+      }

     }
   }
 )
     }
   }
 )