community: Upgrade discourse to v3.3.4 with pg15 upgrade

diff --git a/cookbooks/community/recipes/default.rb b/cookbooks/community/recipes/default.rb
index 51c4624eac89ebe2643a6659c88ae8c966ddc89f..4d34b39016df59a9f7e82d4fe82807fb8fc1c464 100644 (file)
--- a/cookbooks/community/recipes/default.rb
+++ b/cookbooks/community/recipes/default.rb
@@ -63,7 +63,7 @@ git "/srv/community.openstreetmap.org/docker" do
   action :sync
   repository "https://github.com/discourse/discourse_docker.git"
   # DANGER launch wrapper automatically updates git repo if rebuild method used: https://github.com/discourse/discourse_docker/blob/107ffb40fe8b1ea40e00814468db974a4f3f8e8f/launcher#L799
   action :sync
   repository "https://github.com/discourse/discourse_docker.git"
   # DANGER launch wrapper automatically updates git repo if rebuild method used: https://github.com/discourse/discourse_docker/blob/107ffb40fe8b1ea40e00814468db974a4f3f8e8f/launcher#L799

-  revision "136c63890674b95df1327d24270c55e4ef8e87a8"
+  revision "efd6bc8ccbd9057c04d909ff48ecf8b704cae3ff"

   user "root"
   group "root"
   notifies :run, "notify_group[discourse_container_new_data]"
   user "root"
   group "root"
   notifies :run, "notify_group[discourse_container_new_data]"

diff --git a/cookbooks/community/templates/default/data.yml.erb b/cookbooks/community/templates/default/data.yml.erb
index c5c59d2884cea75a777babf715a85126d582ed4e..37573874eb0ebb09c77b8f23854f7e175e622eee 100644 (file)
--- a/cookbooks/community/templates/default/data.yml.erb
+++ b/cookbooks/community/templates/default/data.yml.erb
@@ -3,7 +3,7 @@
 #
 
 templates:
 #
 
 templates:

-  - "templates/postgres.13.template.yml" # NOTE UPDATE THE HOOK REPLACE FOR MAX CONNECTIONS BELOW
+  - "templates/postgres.15.template.yml" # NOTE UPDATE THE HOOK REPLACE FOR MAX CONNECTIONS BELOW

   - "templates/redis.template.yml"
 
 # any extra arguments for Docker?
   - "templates/redis.template.yml"
 
 # any extra arguments for Docker?


@@ -51,6 +51,6 @@ hooks:
 run:
   # Make sure this matches the postgresql version template above
   - replace:
 run:
   # Make sure this matches the postgresql version template above
   - replace:

-      filename: "/etc/postgresql/13/main/postgresql.conf"
+      filename: "/etc/postgresql/15/main/postgresql.conf"

       from: /#?max_connections *=.*/
       to: "max_connections = $db_max_connections"
       from: /#?max_connections *=.*/
       to: "max_connections = $db_max_connections"

diff --git a/cookbooks/community/templates/default/web_only.yml.erb b/cookbooks/community/templates/default/web_only.yml.erb
index 5beef48028613719c639700ff74c01e7af6fe50e..0af44f738eadfeb7874e27124f49867b7943a3b4 100644 (file)
--- a/cookbooks/community/templates/default/web_only.yml.erb
+++ b/cookbooks/community/templates/default/web_only.yml.erb
@@ -19,7 +19,7 @@ links:
 # any extra arguments for Docker?
 # docker_args:
 
 # any extra arguments for Docker?
 # docker_args:
 

-# Latest Version v3.3.3
+# Latest Version v3.3.4

 # Discourse only support tests-passed and stable branches
 params:
   version: stable
 # Discourse only support tests-passed and stable branches
 params:
   version: stable


@@ -121,7 +121,6 @@ hooks:
         from: /listen 80;/
         to: |
           listen 80;
         from: /listen 80;/
         to: |
           listen 80;

-          listen [::]:80;

           rewrite ^/\.well-known/acme-challenge/(.*)$ http://acme.openstreetmap.org/.well-known/acme-challenge/$1 permanent;
 
     - replace:
           rewrite ^/\.well-known/acme-challenge/(.*)$ http://acme.openstreetmap.org/.well-known/acme-challenge/$1 permanent;
 
     - replace: