palulukon: Allow access to AWS IP metadata NTP service

[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 da96fcdd86eb61382507b25a089b399e2a309670..ac847b9ffe2985c87eea1dfe6d6dbf318b2f028b 100644 (file)
--- a/cookbooks/community/templates/default/mail-receiver.yml.erb
+++ b/cookbooks/community/templates/default/mail-receiver.yml.erb
@@ -33,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.


@@ -49,3 +49,6 @@ 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: /srv/community.openstreetmap.org/files/policyd-spf.conf
+      guest: /etc/postfix-policyd-spf-python/policyd-spf.conf