Switch saphira to squid 4

[chef.git] / roles / pummelzacken.rb

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