X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1a5ead7d42566df67d20b7a946a47b4e457efff1..9584cda7a747710c42f2d4b2bd876c4014f1ad6f:/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 b4ca5d2cc..9d4b307fa 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.2.2 +# Latest Version v3.3.2 +# Discourse only support tests-passed and stable branches params: version: stable @@ -114,11 +115,6 @@ hooks: cd: $home cmd: - sudo -H -E -u discourse cp /shared/feeds/update-feeds.atom public/update-feeds.atom - - exec: - # FIXME: Workaround until https://github.com/discourse/discourse/pull/27040 merged - cd: $home - cmd: - - sudo -H -E -u discourse sed -i 's/follow_redirect: false,/follow_redirect: true,/' lib/discourse_ip_info.rb after_ssl: - replace: filename: "/etc/nginx/conf.d/discourse.conf" @@ -134,6 +130,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;