Add logrotate where required

[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 1bcc6e0374f0c3b6401f048d794dd91ab56aad79..9d4b307fa28134216e9dd4ab46ab21a13547c81a 100644 (file)
--- 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:
 
 # any extra arguments for Docker?
 # docker_args:
 

-# Latest Version v3.0.6
+# Latest Version v3.3.2
+# Discourse only support tests-passed and stable branches

 params:
   version: stable
 
 params:
   version: stable
 


@@ -51,6 +52,8 @@ env:
   DISCOURSE_SMTP_USER_NAME:
   DISCOURSE_SMTP_PASSWORD:
   DISCOURSE_SMTP_DOMAIN: community.openstreetmap.org
   DISCOURSE_SMTP_USER_NAME:
   DISCOURSE_SMTP_PASSWORD:
   DISCOURSE_SMTP_DOMAIN: community.openstreetmap.org

+  DISCOURSE_SMTP_OPEN_TIMEOUT: 30
+  DISCOURSE_SMTP_READ_TIMEOUT: 30

   DISCOURSE_NOTIFICATION_EMAIL: community@noreply.openstreetmap.org
 
   ## TODO: configure connectivity to the databases
   DISCOURSE_NOTIFICATION_EMAIL: community@noreply.openstreetmap.org
 
   ## TODO: configure connectivity to the databases


@@ -63,6 +66,7 @@ env:
   ## The maxmind geolocation IP address key for IP address lookup
   ## see https://meta.discourse.org/t/-/137387/23 for details
 <% if @license_keys -%>
   ## The maxmind geolocation IP address key for IP address lookup
   ## see https://meta.discourse.org/t/-/137387/23 for details
 <% if @license_keys -%>

+  DISCOURSE_MAXMIND_ACCOUNT_ID: '<%= node[:geoipupdate][:account] %>'

   DISCOURSE_MAXMIND_LICENSE_KEY: '<%= @license_keys[node[:geoipupdate][:account]] %>'
 <% end -%>
 
   DISCOURSE_MAXMIND_LICENSE_KEY: '<%= @license_keys[node[:geoipupdate][:account]] %>'
 <% end -%>
 


@@ -126,6 +130,6 @@ hooks:
         to: |
           add_header Strict-Transport-Security 'max-age=63072000' always;
           ssl_stapling on;
         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;
           resolver_timeout 5s;
           ssl_dhparam /shared/ssl/dhparam.pem;