X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/1d23c59f10b2636d9c20b3da441aa22373f88af4..c1c41b65a4d71cd179d95dba87e53a39a34c85c3:/roles/dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index b921b40ce..ed6ed2553 100644
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -27,22 +27,24 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["9.5"],
+    :versions => ["9.6"],
     :settings => {
       :defaults => {
         :work_mem => "300MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
         :effective_cache_size => "60GB",
-        :fsync => "on"
+        :fsync => "on",
+        :effective_io_concurrency => "3"
       }
     }
   },
   :nominatim => {
     :state => "standalone",
-    :enable_backup => true,
-    :dbadmins => %w(lonvia tomh),
-    :dbcluster => "9.5/main",
+    :enable_backup => false,
+    :enable_git_updates => true,
+    :dbadmins => %w[lonvia tomh],
+    :dbcluster => "9.6/main",
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :logdir => "/ssd/nominatim/log",
     :tablespaces => {
@@ -56,6 +58,14 @@ default_attributes(
       "isearch" => "/ssd/tablespaces/isearch",
       "daux" => "/ssd/tablespaces/daux",
       "iaux" => "/ssd/tablespaces/iaux"
+    },
+    :fpm_pools => {
+      :www => {
+        :max_children => "100"
+      },
+      :bulk => {
+        :max_children => "15"
+      }
     }
   },
   :sysfs => {
@@ -71,5 +81,5 @@ default_attributes(
 
 run_list(
   "role[ic]",
-  "role[nominatim-base]"
+  "role[nominatim]"
 )