From 6b3b37d700f3830092f39c53777c0dffebe44844 Mon Sep 17 00:00:00 2001
From: Zhang Huangbin <Zhang Huangbin@localhost>
Date: Wed, 8 Apr 2015 17:21:48 +0800
Subject: [PATCH] Mention how to quarantine bad-header message.

---
 TODO.md                 |  4 +++-
 howto/2-quarantining.md |  9 +++++++--
 html/quarantining.html  | 11 ++++++++---
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/TODO.md b/TODO.md
index ef4833c8..aff23adc 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,12 +1,13 @@
 # TODO
 
+* which ports are open: http://www.iredmail.org/forum/topic209-iredmail-support-faq-iredmail-opens-which-network-service-ports.html
+
 * How to install and configure SOGo groupware
 * How to install and configure Nginx
 * How to custom SpamAssassin scores
 * How to enable DNSBL in Postfix.
 * How to install and configure mlmmj (mailing list management tool)
 
-* http://www.iredmail.org/wiki/index.php?title=IRedMail/FAQ/MySQL/install.iredmail.with.remote.mysql.server
 * http://www.iredmail.org/wiki/index.php?title=IRedMail/FAQ/Backup
 * http://www.iredmail.org/wiki/index.php?title=IRedMail/FAQ/Send.out.email.from.specified.IP.address
 * http://www.iredmail.org/forum/topic1968-enabling-ipv6-for-your-iredmail-postfixdovecot.html
@@ -40,6 +41,7 @@
 * ~~ http://www.iredmail.org/install_iredmail_on_rhel.html ~~
 * ~~ https://code.google.com/p/iredmail/wiki/DNS_DKIM ~~
 * ~~ https://code.google.com/p/iredmail/wiki/DNS_SPF ~~
+* ~~ http://www.iredmail.org/wiki/index.php?title=IRedMail/FAQ/MySQL/install.iredmail.with.remote.mysql.server ~~
 
 # Howto
 
diff --git a/howto/2-quarantining.md b/howto/2-quarantining.md
index fe02f22f..b11786ad 100644
--- a/howto/2-quarantining.md
+++ b/howto/2-quarantining.md
@@ -10,7 +10,7 @@ this tutorial.
 With below steps, Virus/Spam/Banned emails will be quarantined into SQL database.
 You can then manage quarantined emails with iRedAdmin-Pro.
 
-## Quarantining spam, virus and banned messages
+## Quarantining spam, virus, banned and bad header messages
 
 Edit Amavisd config file, find below settings and update them. If it doesn't
 exist, please add them.
@@ -24,11 +24,12 @@ or `/etc/amavisd.conf`.
 ```
 # Part of file: /etc/amavisd/amavisd.conf
 
-# Change values of below 3 parameters to D_DISCARD.
+# Change values of below parameters to D_DISCARD.
 # Detected spams/virus/banned messages will not be delivered to user's mailbox.
 $final_virus_destiny = D_DISCARD;
 $final_spam_destiny = D_DISCARD;
 $final_banned_destiny = D_DISCARD;
+$final_bad_header_destiny = D_DISCARD;
 
 # Quarantine SPAM into SQL server.
 $spam_quarantine_to = 'spam-quarantine';
@@ -41,6 +42,10 @@ $virus_quarantine_method = 'sql:';
 # Quarantine BANNED message into SQL server.
 $banned_quarantine_to = 'banned-quarantine';
 $banned_files_quarantine_method = 'sql:';
+
+# Quarantine Bad Header message into SQL server.
+$bad_header_quarantine_method = 'sql:';
+$bad_header_quarantine_to = 'bad-header-quarantine';
 ```
 
 Also, make sure you have below lines configured in same config file:
diff --git a/html/quarantining.html b/html/quarantining.html
index 9fc559bf..4c907e4b 100644
--- a/html/quarantining.html
+++ b/html/quarantining.html
@@ -14,7 +14,7 @@
 <div class="toc">
 <ul>
 <li><a href="#quarantining">Quarantining</a><ul>
-<li><a href="#quarantining-spam-virus-and-banned-messages">Quarantining spam, virus and banned messages</a></li>
+<li><a href="#quarantining-spam-virus-banned-and-bad-header-messages">Quarantining spam, virus, banned and bad header messages</a></li>
 <li><a href="#configure-iredadmin-pro-to-manage-quarantined-mails">Configure iRedAdmin-Pro to manage quarantined mails</a></li>
 <li><a href="#quarantine-clean-emails">Quarantine clean emails</a></li>
 <li><a href="#screenshots">Screenshots</a></li>
@@ -27,7 +27,7 @@ by iRedMail but disabled by default, you can easily enable quarantining with
 this tutorial.</p>
 <p>With below steps, Virus/Spam/Banned emails will be quarantined into SQL database.
 You can then manage quarantined emails with iRedAdmin-Pro.</p>
-<h2 id="quarantining-spam-virus-and-banned-messages">Quarantining spam, virus and banned messages</h2>
+<h2 id="quarantining-spam-virus-banned-and-bad-header-messages">Quarantining spam, virus, banned and bad header messages</h2>
 <p>Edit Amavisd config file, find below settings and update them. If it doesn't
 exist, please add them.</p>
 <ul>
@@ -39,11 +39,12 @@ or <code>/etc/amavisd.conf</code>.</li>
 </ul>
 <pre><code># Part of file: /etc/amavisd/amavisd.conf
 
-# Change values of below 3 parameters to D_DISCARD.
+# Change values of below parameters to D_DISCARD.
 # Detected spams/virus/banned messages will not be delivered to user's mailbox.
 $final_virus_destiny = D_DISCARD;
 $final_spam_destiny = D_DISCARD;
 $final_banned_destiny = D_DISCARD;
+$final_bad_header_destiny = D_DISCARD;
 
 # Quarantine SPAM into SQL server.
 $spam_quarantine_to = 'spam-quarantine';
@@ -56,6 +57,10 @@ $virus_quarantine_method = 'sql:';
 # Quarantine BANNED message into SQL server.
 $banned_quarantine_to = 'banned-quarantine';
 $banned_files_quarantine_method = 'sql:';
+
+# Quarantine Bad Header message into SQL server.
+$bad_header_quarantine_method = 'sql:';
+$bad_header_quarantine_to = 'bad-header-quarantine';
 </code></pre>
 
 <p>Also, make sure you have below lines configured in same config file:</p>