7x31/mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging' into feature/fts-xapian

Browse Source
This commit is contained in:
Niklas Meyer
2022-03-02 17:07:18 +01:00
committed by GitHub
parent 5bd3394ed9 a1ffaae3d5
commit 8dba0ca7dd
27 changed files with 1487 additions and 603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1528
data/Dockerfiles/dovecot/imapsync
View File

File diff suppressed because it is too large Load Diff

2
data/Dockerfiles/dovecot/quarantine_notify.py
View File

@@ -161,7 +161,7 @@ try:
attrs = json.loads(attrs.decode('utf-8'))
if attrs['quarantine_notification'] not in ('hourly', 'daily', 'weekly'):
continue
if last_notification == 0 or (last_notification + time_trans[attrs['quarantine_notification']]) < time_now:
if last_notification == 0 or (last_notification + time_trans[attrs['quarantine_notification']]) <= time_now:
print("Notifying %s: Considering %d new items in quarantine (policy: %s)" % (record['rcpt'], record['counter'], attrs['quarantine_notification']))
notify_rcpt(record['rcpt'], record['counter'], record['quarantine_acl'], attrs['quarantine_category'])