Use chef 14 to run tests

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index 59853cc0d26322c1ca7bd343642d90fcd91d1e22..d237bd0535e5567a523eecc28862074e55b74b25 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -19,7 +19,7 @@ default_attributes(
     }
   },
   :postgresql => {
     }
   },
   :postgresql => {

-    :versions => ["9.6"],
+    :versions => ["12"],

     :settings => {
       :defaults => {
         :listen_addresses => "10.0.0.20",
     :settings => {
       :defaults => {
         :listen_addresses => "10.0.0.20",


@@ -27,6 +27,7 @@ default_attributes(
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
         :effective_cache_size => "60GB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
         :effective_cache_size => "60GB",

+        :effective_io_concurrency => "256",

         :fsync => "on"
       }
     }
         :fsync => "on"
       }
     }


@@ -34,7 +35,8 @@ default_attributes(
   :nominatim => {
     :state => "standalone",
     :dbadmins => %w[lonvia tomh],
   :nominatim => {
     :state => "standalone",
     :dbadmins => %w[lonvia tomh],

-    :dbcluster => "9.6/main",
+    :dbcluster => "12/main",
+    :postgis => "2.5",

     :enable_backup => true,
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :tablespaces => {
     :enable_backup => true,
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :tablespaces => {


@@ -48,6 +50,11 @@ default_attributes(
       "isearch" => "/ssd/tablespaces/isearch",
       "daux" => "/data/tablespaces/daux",
       "iaux" => "/data/tablespaces/iaux"
       "isearch" => "/ssd/tablespaces/isearch",
       "daux" => "/data/tablespaces/daux",
       "iaux" => "/data/tablespaces/iaux"

+    },
+    :fpm_pools => {
+      :www => {
+        :max_children => "40"
+      }

     }
   }
 )
     }
   }
 )