diff options
| author | drebs <drebs@leap.se> | 2015-04-21 17:02:47 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2015-04-21 17:02:47 -0300 |
| commit | ad8c61d00fb7d2474d129a5bb553dd0f5206f279 (patch) | |
| tree | f6b6ee915ebe28b61655bbbd2c8ed57e1bc72020 /pkg/leap_mx.tac | |
| parent | 5d0fffda31e0f07f7f8396fda961d3d0fac33733 (diff) | |
| parent | 799703cf884191d097eb5d5316fa964e421683fd (diff) | |
Merge tag '0.6.2' into debian/release-0.6.2
Tag leap.mx version 0.6.2
Conflicts:
CHANGELOG
src/leap/mx/mail_receiver.py
Diffstat (limited to 'pkg/leap_mx.tac')
| -rw-r--r-- | pkg/leap_mx.tac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/leap_mx.tac b/pkg/leap_mx.tac index 75d2405..7da59cf 100644 --- a/pkg/leap_mx.tac +++ b/pkg/leap_mx.tac @@ -46,8 +46,8 @@ password = config.get("couchdb", "password") server = config.get("couchdb", "server") port = config.get("couchdb", "port") -bounce_from = "bounce" -bounce_subject = "Delivery failure" +bounce_from = "Mail Delivery Subsystem <MAILER-DAEMON>" +bounce_subject = "Undelivered Mail Returned to Sender" try: bounce_from = config.get("bounce", "from") |