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

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index 051a4feb3536d76a58d34f828e6183f3dee716da..cad14d6fdc3cc3ddcde63768dcd7a5e6f0d3f533 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -28,35 +28,33 @@ default_attributes(
     }
   },
   :postgresql => {
     }
   },
   :postgresql => {

+    :versions => ["9.4"],

     :settings => {
       :defaults => {
     :settings => {
       :defaults => {

-        :shared_buffers => "10GB",
-        :work_mem => "160MB",
-        :maintenance_work_mem => "20GB",
+        :work_mem => "300MB",
+        :maintenance_work_mem => "10GB",

         :random_page_cost => "1.5",
         :effective_cache_size => "60GB",
         :random_page_cost => "1.5",
         :effective_cache_size => "60GB",

-        :fsync => "off"
+        :fsync => "on"

       }
     }
   },
   :nominatim => {
     :enabled => false,
     :flatnode_file => "/ssd/nominatim/nodes.store",
       }
     }
   },
   :nominatim => {
     :enabled => false,
     :flatnode_file => "/ssd/nominatim/nodes.store",

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

     :database => {
       :cluster => "9.4/main",
       :dbname => "nominatim",
       :postgis => "2.1"
     :database => {
       :cluster => "9.4/main",
       :dbname => "nominatim",
       :postgis => "2.1"

-    },
-    :fpm_pools => {
-      :www => {
-        :port => "8000",
-        :pm => "dynamic",
-        :max_children => "60"
-      },
-      :bulk => {
-        :port => "8001",
-        :pm => "static",
-        :max_children => "10"
+    }
+  },
+  :sysfs => {
+    :md_tune => {
+      :comment => "Enable request merging for NVMe devices",
+      :parameters => {
+        "block/nvme0n1/queue/nomerges" => "1",
+        "block/nvme1n1/queue/nomerges" => "1"

       }
     }
   }
       }
     }
   }