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

[chef.git] / roles / stormfly-04.rb

diff --git a/roles/stormfly-04.rb b/roles/stormfly-04.rb
index e0491b15cf84a94af57f2965c235f78c093d14d2..b59bf690e9121c78f2cd251d267bf4ebfba4ff1c 100644 (file)
--- a/roles/stormfly-04.rb
+++ b/roles/stormfly-04.rb
@@ -29,20 +29,14 @@ default_attributes(
     :settings => {
       :defaults => {
         :work_mem => "300MB",
-        :maintenance_work_mem => "10GB",
-        :random_page_cost => "1.5",
-        :effective_cache_size => "60GB",
-        :fsync => "off",
+        :fsync => "on",
         :effective_io_concurrency => "100"
       }
     }
   },
   :nominatim => {
     :state => "standalone",
-    :enable_backup => false,
-    :enable_git_updates => true,
     :enable_qa_tiles => true,
-    :dbadmins => %w[lonvia tomh],
     :dbcluster => "14/main",
     :postgis => "3",
     :flatnode_file => "/ssd/nominatim/nodes.store",
@@ -51,18 +45,6 @@ default_attributes(
       "nominatim.openstreetmap.org" => {
         :max_children => 100
       }
-    },
-    :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"
     }
   }
 )