X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/8552100131a86494cebed823f97017edf3af9dfd..4132fbaac05b0e09d426e3db521180a24e1afe2d:/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 564d8da5f..9db551e24 100644
--- a/cookbooks/community/templates/default/web_only.yml.erb
+++ b/cookbooks/community/templates/default/web_only.yml.erb
@@ -1,5 +1,6 @@
 templates:
   - "templates/web.template.yml"
+  - "templates/web.ipv6.template.yml"
   - "templates/web.ssl.template.yml"
 
 ## which TCP/IP ports should this container expose?
@@ -18,7 +19,7 @@ links:
 # any extra arguments for Docker?
 # docker_args:
 
-# Latest Version v3.0.1
+# Latest Version v3.0.6
 params:
   version: stable
 
@@ -65,6 +66,9 @@ env:
   DISCOURSE_MAXMIND_LICENSE_KEY: '<%= @license_keys[node[:geoipupdate][:account]] %>'
 <% end -%>
 
+  # Allow list for prometheus metric collection
+  DISCOURSE_PROMETHEUS_TRUSTED_IP_ALLOWLIST_REGEX: '^<%= @prometheus_servers.map { |a| Regexp.escape(a) }.join("|") %>$'
+
   # Increase base SIDEKIQ memory limit to 1GB
   UNICORN_SIDEKIQ_MAX_RSS: 1000
 
@@ -81,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
@@ -92,12 +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 https://github.com/discourse/discourse-translator.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-canned-replies.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
     - exec:
         # Needs to be copied in else builtin git cleanup fails
         cd: $home
@@ -109,10 +117,15 @@ 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:
         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;