diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-10-12 10:23:36 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-10-12 10:23:36 +0100 |
| commit | bb5f18ff9253b82d4402db29e24eb1359818baae (patch) | |
| tree | ef65812d18838cb8fde964c5dc17a643355fd02c /lib | |
| parent | 8d04d8a492a7d0a78802bd89998006352b910581 (diff) | |
| parent | f9507e0347b9b423791530bc57be00ac873646d5 (diff) | |
Merge remote-tracking branch 'openaustralia_github/postfix_log_support' into develop
Conflicts:
Gemfile.lock
app/models/exim_log.rb
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/configuration.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/configuration.rb b/lib/configuration.rb index 5f761a1f6..ee2ce40c5 100644 --- a/lib/configuration.rb +++ b/lib/configuration.rb @@ -30,6 +30,7 @@ module Configuration :INCOMING_EMAIL_SECRET => 'dummysecret', :ISO_COUNTRY_CODE => 'GB', :MAX_REQUESTS_PER_USER_PER_DAY => nil, + :MTA_LOG_TYPE => 'exim', :NEW_RESPONSE_REMINDER_AFTER_DAYS => [3, 10, 24], :OVERRIDE_ALL_PUBLIC_BODY_REQUEST_EMAILS => '', :RAW_EMAILS_LOCATION => 'files/raw_emails', |