Improved CLI, quarantine- and error handling

This commit is contained in:
2019-03-13 09:27:58 +01:00
parent da6f08ee25
commit 88cea0e127
10 changed files with 508 additions and 301 deletions

View File

@@ -19,6 +19,15 @@
#
quarantines = spam
# Option: quarantine_action_precedence
# Notes: Set if the action of the first or the last matching quarantine should
# be used if multiple recipients match multiple quarantines. If an original
# email is delivered to at least one recipient due to whitelisting, the
# email will always be accepted.
# Values: [ first | last ]
#
preferred_quarantine_action = last
# Option: smtp_host
# Notes: Set the SMTP host. It will be used to (re-)inject emails.
# Values: [ HOSTNAME | IP_ADDRESS ]

View File

@@ -1,10 +1,25 @@
<html>
<body>
<h1>This is a spam notification mail</h1>
<b>From:</b> {EMAIL_FROM}<br/>
<b>To:</b> {EMAIL_TO}<br/>
<b>Subject:</b> {EMAIL_SUBJECT}<br/>
<b>Quarantine-ID:</b> {EMAIL_QUARANTINE_ID}<br/><br/><br/>
{EMAIL_HTML_TEXT}
<h1>Quarantine ntification</h1>
<table>
<tr>
<td><b>From:</b></td>
<td>{EMAIL_FROM}</td>
</tr>
<tr>
<td><b>To:</b></td>
<td>{EMAIL_TO}</td>
</tr>
<tr>
<td><b>Subject:</b></td>
<td>{EMAIL_SUBJECT}</td>
</tr>
<tr>
<td><b>Quarantine ID:</b></td>
<td>{EMAIL_QUARANTINE_ID}</td>
</tr>
</table><br/>
<h2>Preview of the original e-mail</h2>
{EMAIL_HTML_TEXT}
</body>
</html>