]> git.openstreetmap.org Git - chef.git/commitdiff
Upgrade dev server to postgres 14
authorTom Hughes <tom@compton.nu>
Thu, 25 Nov 2021 19:09:08 +0000 (19:09 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 25 Nov 2021 19:09:08 +0000 (19:09 +0000)
cookbooks/dev/recipes/default.rb
roles/dev.rb

index cae4e372992d0302509bab5ab77da24c3e493240..5a4110c7513cd2dffa8261003d2346c611f72049 100644 (file)
@@ -202,9 +202,9 @@ search(:accounts, "*:*").each do |account|
   end
 end
 
-if node[:postgresql][:clusters][:"13/main"]
+if node[:postgresql][:clusters][:"14/main"]
   postgresql_user "apis" do
-    cluster "13/main"
+    cluster "14/main"
   end
 
   template "/usr/local/bin/cleanup-rails-assets" do
@@ -262,12 +262,12 @@ if node[:postgresql][:clusters][:"13/main"]
       secret_key_base = persistent_token("dev", "rails", name, "secret_key_base")
 
       postgresql_database database_name do
-        cluster "13/main"
+        cluster "14/main"
         owner "apis"
       end
 
       postgresql_extension "#{database_name}_btree_gist" do
-        cluster "13/main"
+        cluster "14/main"
         database database_name
         extension "btree_gist"
       end
@@ -309,7 +309,7 @@ if node[:postgresql][:clusters][:"13/main"]
         group "apis"
         repository details[:repository]
         revision details[:revision]
-        database_port node[:postgresql][:clusters][:"13/main"][:port]
+        database_port node[:postgresql][:clusters][:"14/main"][:port]
         database_name database_name
         database_username "apis"
         email_from "OpenStreetMap <web@noreply.openstreetmap.org>"
@@ -381,7 +381,7 @@ if node[:postgresql][:clusters][:"13/main"]
           group "root"
           mode "640"
           variables :cgimap_port => cgimap_port,
-                    :database_port => node[:postgresql][:clusters][:"13/main"][:port],
+                    :database_port => node[:postgresql][:clusters][:"14/main"][:port],
                     :database_name => database_name,
                     :log_directory => log_directory
           notifies :restart, "service[cgimap@#{name}]"
@@ -445,7 +445,7 @@ if node[:postgresql][:clusters][:"13/main"]
 
       postgresql_database database_name do
         action :drop
-        cluster "13/main"
+        cluster "14/main"
       end
     end
   end
index 6c867f33db4d48bf4ef682577559195b2b0dfd32..3c9ae819660d8dcc8d8b23fda73cb9a9fd9f6c4d 100644 (file)
@@ -137,7 +137,7 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["13"],
+    :versions => ["14"],
     :settings => {
       :defaults => {
         :max_connections => "500",
@@ -147,7 +147,7 @@ default_attributes(
         :max_stack_depth => "4MB",
         :effective_cache_size => "4GB"
       },
-      "13" => {
+      "14" => {
         :port => "5432",
         :wal_level => "logical",
         :max_replication_slots => "1"