Drop segment length limit from tile server replication

[chef.git] / cookbooks / community / templates / default / mail-receiver.yml.erb

diff --git a/cookbooks/community/templates/default/mail-receiver.yml.erb b/cookbooks/community/templates/default/mail-receiver.yml.erb
index 4460d30f9b4fa27abd73b21008816f050dcf1dec..ac847b9ffe2985c87eea1dfe6d6dbf318b2f028b 100644 (file)
--- a/cookbooks/community/templates/default/mail-receiver.yml.erb
+++ b/cookbooks/community/templates/default/mail-receiver.yml.erb
@@ -21,11 +21,9 @@ env:
   ## Where e-mail to your forum should be sent.  In general, it's perfectly fine
   ## to use the same domain as the forum itself here.
   MAIL_DOMAIN: community.openstreetmap.org
   ## Where e-mail to your forum should be sent.  In general, it's perfectly fine
   ## to use the same domain as the forum itself here.
   MAIL_DOMAIN: community.openstreetmap.org

-# uncomment these (and the volume below!) to support TLS
-#  POSTCONF_smtpd_tls_key_file:  /letsencrypt/discourse.example.com/discourse.example.com.key
-#  POSTCONF_smtpd_tls_cert_file:  /letsencrypt/discourse.example.com/fullchain.cer
-#  POSTCONF_smtpd_tls_security_level: may
-
+  POSTCONF_smtpd_tls_key_file: /shared/ssl/ssl.key
+  POSTCONF_smtpd_tls_cert_file: /shared/ssl/ssl.crt
+  POSTCONF_smtpd_tls_security_level: may

 
   ## The URL of the mail processing endpoint of your Discourse forum.
   ## This is simply your forum's base URL, with `/admin/email/handle_mail`
 
   ## The URL of the mail processing endpoint of your Discourse forum.
   ## This is simply your forum's base URL, with `/admin/email/handle_mail`


@@ -35,7 +33,7 @@ env:
 
   ## The master API key of your Discourse forum.  You can get this from
   ## the "API" tab of your admin panel.
 
   ## The master API key of your Discourse forum.  You can get this from
   ## the "API" tab of your admin panel.

-  DISCOURSE_API_KEY: abcdefghijklmnop
+  DISCOURSE_API_KEY: '<%= @passwords["mail_receiver_api_key"] %>'

 
   ## The username to use for processing incoming e-mail.  Unless you have
   ## renamed the `system` user, you should leave this as-is.
 
   ## The username to use for processing incoming e-mail.  Unless you have
   ## renamed the `system` user, you should leave this as-is.


@@ -45,9 +43,12 @@ volumes:
   - volume:
       host: /srv/community.openstreetmap.org/shared/mail-receiver/postfix-spool
       guest: /var/spool/postfix
   - volume:
       host: /srv/community.openstreetmap.org/shared/mail-receiver/postfix-spool
       guest: /var/spool/postfix

-# uncomment to support TLS
-#  - volume:
-#      host: /var/discourse/shared/standalone/letsencrypt
-#      guest: /letsencrypt
-
-
+  - volume:
+      host: /etc/ssl/certs/community.openstreetmap.org.pem
+      guest: /shared/ssl/ssl.crt
+  - volume:
+      host: /etc/ssl/private/community.openstreetmap.org.key
+      guest: /shared/ssl/ssl.key
+  - volume:
+      host: /srv/community.openstreetmap.org/files/policyd-spf.conf
+      guest: /etc/postfix-policyd-spf-python/policyd-spf.conf