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

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index e40e048343a1c93d8544c77eb2ee5c71855ab640..cad14d6fdc3cc3ddcde63768dcd7a5e6f0d3f533 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -28,6 +28,7 @@ default_attributes(
     }
   },
   :postgresql => {
+    :versions => ["9.4"],
     :settings => {
       :defaults => {
         :work_mem => "300MB",
@@ -41,21 +42,19 @@ default_attributes(
   :nominatim => {
     :enabled => false,
     :flatnode_file => "/ssd/nominatim/nodes.store",
+    :logdir => "/ssd/nominatim/log",
     :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"
       }
     }
   }