Run chrony_exporter for prometheus

[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 eb46dbe37ae1b733a25dd2ef819f4a37e85f812a..c3af3eb8364b990d340bc34956ae5047430ab2a1 100644 (file)
--- 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:
   - "templates/web.template.yml"

+  - "templates/web.ipv6.template.yml"

   - "templates/web.ssl.template.yml"
 
 ## which TCP/IP ports should this container expose?
   - "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:
 
 # any extra arguments for Docker?
 # docker_args:
 

-# Latest Version v3.0.1
+# Latest Version v3.0.3

 params:
   version: stable
 
 params:
   version: stable
 


@@ -65,6 +66,9 @@ env:
   DISCOURSE_MAXMIND_LICENSE_KEY: '<%= @license_keys[node[:geoipupdate][:account]] %>'
 <% end -%>
 
   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
 
   # Increase base SIDEKIQ memory limit to 1GB
   UNICORN_SIDEKIQ_MAX_RSS: 1000
 


@@ -81,9 +85,12 @@ volumes:
   - volume:
       host: /etc/ssl/private/community.openstreetmap.org.key
       guest: /shared/ssl/ssl.key
   - 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
   - volume:
       host: /srv/community.openstreetmap.org/files/update-feeds.atom

-      guest: /var/www/discourse/public/update-feeds.atom
+      guest: /shared/feeds/update-feeds.atom

 
 ## Plugins go here
 ## see https://meta.discourse.org/t/19157 for details
 
 ## Plugins go here
 ## see https://meta.discourse.org/t/19157 for details


@@ -97,17 +104,29 @@ hooks:
           - 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-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
+          # FIXME revert to upstream once PR has been merged: https://github.com/discourse/discourse-translator/pull/103
+          - 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
+    - exec:
+        # Needs to be copied in else builtin git cleanup fails
+        cd: $home
+        cmd:
+          - sudo -H -E -u discourse cp /shared/feeds/update-feeds.atom public/update-feeds.atom

   after_ssl:
     - replace:
         filename: "/etc/nginx/conf.d/discourse.conf"
         from: /listen 80;/
         to: |
           listen 80;
   after_ssl:
     - replace:
         filename: "/etc/nginx/conf.d/discourse.conf"
         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: |
           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=31536000; preload';
+          ssl_stapling on;
+          resolver <%= node[:networking][:nameservers].join(" ") %>;
+          resolver_timeout 5s;
+          ssl_dhparam /shared/ssl/dhparam.pem;