tilecache: Remove USA peers from NZ caches

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index 51f6efab8dd3bb5ec11bb954ce996265486daaa8..35c811f3533109f4a61f5fced107590cdfaf3ef2 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -28,7 +28,7 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["9.6"],
+    :versions => ["10"],
     :settings => {
       :defaults => {
         :work_mem => "300MB",
@@ -45,8 +45,8 @@ default_attributes(
     :enable_backup => false,
     :enable_git_updates => true,
     :dbadmins => %w[lonvia tomh],
-    :dbcluster => "9.6/main",
-    :postgis => "2.3",
+    :dbcluster => "10/main",
+    :postgis => "2.4",
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :logdir => "/ssd/nominatim/log",
     :tablespaces => {
@@ -61,15 +61,6 @@ default_attributes(
       "daux" => "/ssd/tablespaces/daux",
       "iaux" => "/ssd/tablespaces/iaux"
     }
-  },
-  :sysfs => {
-    :md_tune => {
-      :comment => "Enable request merging for NVMe devices",
-      :parameters => {
-        "block/nvme0n1/queue/nomerges" => "1",
-        "block/nvme1n1/queue/nomerges" => "1"
-      }
-    }
   }
 )