X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/08a2e7fb46cfb139567dc5a115dad99c23891dd1..5509e718aab0cba4ed8334bd7b310f7b85b61302:/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 225b98905..0af44f738 100644 --- 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.1.4 +# Latest Version v3.3.4 +# Discourse only support tests-passed and stable branches params: version: stable @@ -65,7 +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_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 @@ -119,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: @@ -128,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;