X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/45d88308c2c063938842f644a89ce2cc3378f601..7532a5a593bcb24e1f72338cc9013562d74eae7f:/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 58d6868e4..e215971e9 100644 --- a/cookbooks/community/templates/default/web_only.yml.erb +++ b/cookbooks/community/templates/default/web_only.yml.erb @@ -66,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 @@ -98,7 +101,8 @@ 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-translator.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 - exec: # Needs to be copied in else builtin git cleanup fails cd: $home