Use ruby 2.5 on stormfly-01

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index f512fe03cf4cff1cbc035bb91c4e780dda6b657a..adf37e26e68ae267cedd38a97c0e0180dca94965 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -27,21 +27,24 @@ default_attributes(
     }
   },
   :postgresql => {
     }
   },
   :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",
     :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 => {
       }
     }
   },
   :nominatim => {

-    :state => "off",
-    :dbadmins => %w(lonvia tomh),
-    :dbcluster => "9.5/main",
+    :state => "standalone",
+    :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 => {
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :logdir => "/ssd/nominatim/log",
     :tablespaces => {


@@ -70,5 +73,5 @@ default_attributes(
 
 run_list(
   "role[ic]",
 
 run_list(
   "role[ic]",

-  "role[nominatim-base]"
+  "role[nominatim]"

 )
 )