tilecache: remove ridgeback as peer from culebre

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index f5a573d47d01e952b31893b7b511065c387d56f1..e431a66455a9efb8ce98f4fb5c65ed6c01a31665 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -19,7 +19,7 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["9.5"],
+    :versions => ["10"],
     :settings => {
       :defaults => {
         :listen_addresses => "10.0.0.20",
@@ -33,8 +33,10 @@ default_attributes(
   },
   :nominatim => {
     :state => "standalone",
-    :dbadmins => %w(lonvia tomh),
-    :dbcluster => "9.5/main",
+    :dbadmins => %w[lonvia tomh],
+    :dbcluster => "10/main",
+    :postgis => "2.4",
+    :enable_backup => true,
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :tablespaces => {
       "dosm" => "/ssd/tablespaces/dosm",
@@ -47,6 +49,11 @@ default_attributes(
       "isearch" => "/ssd/tablespaces/isearch",
       "daux" => "/data/tablespaces/daux",
       "iaux" => "/data/tablespaces/iaux"
+    },
+    :fpm_pools => {
+      :www => {
+        :max_children => "40"
+      }
     }
   }
 )