X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/7532a5a593bcb24e1f72338cc9013562d74eae7f..9d1da497d442b16de5ab68a9cf74f832059734e7:/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 e215971e9..1bcc6e037 100644 --- 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: -# Latest Version v3.0.2 +# Latest Version v3.0.6 params: version: stable @@ -85,6 +85,9 @@ volumes: - volume: host: /etc/ssl/private/community.openstreetmap.org.key guest: /shared/ssl/ssl.key + - volume: + host: /etc/ssl/certs/dhparam.pem + guest: /shared/ssl/dhparam.pem - volume: host: /srv/community.openstreetmap.org/files/update-feeds.atom guest: /shared/feeds/update-feeds.atom @@ -96,13 +99,13 @@ hooks: - exec: cd: $home/plugins cmd: - - sudo -H -E -u discourse git clone --depth 1 https://github.com/discourse/discourse-oauth2-basic.git - - sudo -H -E -u discourse git clone --depth 1 https://github.com/discourse/discourse-solved.git - - sudo -H -E -u discourse git clone --depth 1 https://github.com/discourse/discourse-canned-replies.git - - sudo -H -E -u discourse git clone --depth 1 https://github.com/discourse/discourse-reactions.git - - sudo -H -E -u discourse git clone --depth 1 https://github.com/discourse/discourse-prometheus.git - - sudo -H -E -u discourse git clone --depth 1 --branch serbian-digraphic-fix https://github.com/Firefishy/discourse-translator.git - - sudo -H -E -u discourse git clone --depth 1 https://github.com/discourse/discourse-saved-searches.git + - sudo -H -E -u discourse git clone --depth 1 --branch main https://github.com/discourse/discourse-oauth2-basic.git + - sudo -H -E -u discourse git clone --depth 1 --branch main https://github.com/discourse/discourse-solved.git + - sudo -H -E -u discourse git clone --depth 1 --branch main https://github.com/discourse/discourse-reactions.git + - sudo -H -E -u discourse git clone --depth 1 --branch main https://github.com/discourse/discourse-prometheus.git + - sudo -H -E -u discourse git clone --depth 1 --branch main https://github.com/discourse/discourse-translator.git + - sudo -H -E -u discourse git clone --depth 1 --branch main https://github.com/discourse/discourse-saved-searches.git + - sudo -H -E -u discourse git clone --depth 1 --branch main https://github.com/discourse/discourse-post-voting.git - exec: # Needs to be copied in else builtin git cleanup fails cd: $home @@ -121,4 +124,8 @@ hooks: filename: "/etc/nginx/conf.d/discourse.conf" from: /add_header.+/ to: | - add_header Strict-Transport-Security 'max-age=63072000'; + add_header Strict-Transport-Security 'max-age=63072000' always; + ssl_stapling on; + resolver <%= node[:networking][:nameservers].join(" ") %>; + resolver_timeout 5s; + ssl_dhparam /shared/ssl/dhparam.pem;