Upgrade dev server to postgres 13

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index e4a977f8a225487b385da6843a8f383942fb0270..15e9e7bbf6f1d986d5eb9070dfd5a30053846763 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -201,9 +201,9 @@ search(:accounts, "*:*").each do |account|
   end
 end
 
-if node[:postgresql][:clusters][:"12/main"]
+if node[:postgresql][:clusters][:"13/main"]
   postgresql_user "apis" do
-    cluster "12/main"
+    cluster "13/main"
   end
 
   template "/usr/local/bin/cleanup-rails-assets" do
@@ -261,12 +261,12 @@ if node[:postgresql][:clusters][:"12/main"]
       secret_key_base = persistent_token("dev", "rails", name, "secret_key_base")
 
       postgresql_database database_name do
-        cluster "12/main"
+        cluster "13/main"
         owner "apis"
       end
 
       postgresql_extension "#{database_name}_btree_gist" do
-        cluster "12/main"
+        cluster "13/main"
         database database_name
         extension "btree_gist"
       end
@@ -308,7 +308,7 @@ if node[:postgresql][:clusters][:"12/main"]
         group "apis"
         repository details[:repository]
         revision details[:revision]
-        database_port node[:postgresql][:clusters][:"12/main"][:port]
+        database_port node[:postgresql][:clusters][:"13/main"][:port]
         database_name database_name
         database_username "apis"
         email_from "OpenStreetMap <web@noreply.openstreetmap.org>"
@@ -380,7 +380,7 @@ if node[:postgresql][:clusters][:"12/main"]
           group "root"
           mode "640"
           variables :cgimap_port => cgimap_port,
-                    :database_port => node[:postgresql][:clusters][:"12/main"][:port],
+                    :database_port => node[:postgresql][:clusters][:"13/main"][:port],
                     :database_name => database_name,
                     :log_directory => log_directory
           notifies :restart, "service[cgimap@#{name}]"
@@ -444,7 +444,7 @@ if node[:postgresql][:clusters][:"12/main"]
 
       postgresql_database database_name do
         action :drop
-        cluster "12/main"
+        cluster "13/main"
       end
     end
   end

diff --git a/roles/dev.rb b/roles/dev.rb
index 28305762642766c97b91d79f40bf639d99d0d187..3eec5fd91b77fdbbd972c6f47d96bfa571375361 100644 (file)
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -131,7 +131,7 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["12"],
+    :versions => ["13"],
     :settings => {
       :defaults => {
         :max_connections => "500",
@@ -141,7 +141,7 @@ default_attributes(
         :max_stack_depth => "4MB",
         :effective_cache_size => "4GB"
       },
-      "12" => {
+      "13" => {
         :port => "5432",
         :wal_level => "logical",
         :max_replication_slots => "1"