community: Upgrade discourse to v3.3.4 with pg15 upgrade

[chef.git] / cookbooks / community / templates / default / web_only.yml.erb

diff --git a/cookbooks/community/templates/default/web_only.yml.erb b/cookbooks/community/templates/default/web_only.yml.erb
index 2764f03b7d139aa77c1bc23ab1523b8781acc146..0af44f738eadfeb7874e27124f49867b7943a3b4 100644 (file)
--- a/cookbooks/community/templates/default/web_only.yml.erb
+++ b/cookbooks/community/templates/default/web_only.yml.erb
@@ -19,7 +19,8 @@ links:
 # any extra arguments for Docker?
 # docker_args:
 
-# Latest Version v3.2.2
+# Latest Version v3.3.4
+# Discourse only support tests-passed and stable branches
 params:
   version: stable
 
@@ -65,8 +66,8 @@ env:
   ## The maxmind geolocation IP address key for IP address lookup
   ## see https://meta.discourse.org/t/-/137387/23 for details
 <% if @license_keys -%>
-  DISCOURSE_MAXMIND_ACCOUNT_ID: '<%= node[:geoipupdate][:account] %>'
-  DISCOURSE_MAXMIND_LICENSE_KEY: '<%= @license_keys[node[:geoipupdate][:account]] %>'
+  # DISCOURSE_MAXMIND_ACCOUNT_ID: '<%= node[:geoipupdate][:account] %>'
+  # DISCOURSE_MAXMIND_LICENSE_KEY: '<%= @license_keys[node[:geoipupdate][:account]] %>'
 <% end -%>
 
   # Allow list for prometheus metric collection
@@ -120,7 +121,6 @@ hooks:
         from: /listen 80;/
         to: |
           listen 80;
-          listen [::]:80;
           rewrite ^/\.well-known/acme-challenge/(.*)$ http://acme.openstreetmap.org/.well-known/acme-challenge/$1 permanent;
 
     - replace:
@@ -129,6 +129,6 @@ hooks:
         to: |
           add_header Strict-Transport-Security 'max-age=63072000' always;
           ssl_stapling on;
-          resolver <%= node[:networking][:nameservers].join(" ") %>;
+          resolver <%= @resolvers.join(" ") %>;
           resolver_timeout 5s;
           ssl_dhparam /shared/ssl/dhparam.pem;