Revert "community: Fix CSRF issue with monkey patch fix"

[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..5beef48028613719c639700ff74c01e7af6fe50e 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:
 
 # any extra arguments for Docker?
 # docker_args:
 

-# Latest Version v3.2.2
+# Latest Version v3.3.3
+# Discourse only support tests-passed and stable branches

 params:
   version: stable
 
 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 -%>
   ## 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
 <% end -%>
 
   # Allow list for prometheus metric collection


@@ -129,6 +130,6 @@ hooks:
         to: |
           add_header Strict-Transport-Security 'max-age=63072000' always;
           ssl_stapling on;
         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;
           resolver_timeout 5s;
           ssl_dhparam /shared/ssl/dhparam.pem;