From 8e08d3aca16a0b1639dbd303dcc1a0fe1859ec68 Mon Sep 17 00:00:00 2001
From: Zhang Huangbin <zhb@iredmail.org>
Date: Mon, 27 Apr 2020 10:04:51 +0800
Subject: [PATCH] Mention updating SA and iRedAPD config file to sync trusted
 clients from Postfix 'mynetworks'.

---
 .../8-migrate.to.iredmail.easy.md              | 18 ++++++++++++++++++
 html/migrate.to.iredmail.easy.html             | 14 ++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/en_US/iredmail-easy/8-migrate.to.iredmail.easy.md b/en_US/iredmail-easy/8-migrate.to.iredmail.easy.md
index ee389515..9089ab1e 100644
--- a/en_US/iredmail-easy/8-migrate.to.iredmail.easy.md
+++ b/en_US/iredmail-easy/8-migrate.to.iredmail.easy.md
@@ -162,6 +162,15 @@ files under `/opt/iredmail/custom/<software>/`.
 Split custom settings from `/etc/mail/spamassassin/local.cf` to
 `/opt/iredmail/custom/spamassassin/custom.cf`.
 
+If you have whitelisted IP addresses/networks listed in Postfix config file
+`/etc/postfix/main.cf`, parameter `mynetworks =`, you may want to whitelist
+them to avoid spam/virus scanning in `/opt/iredmail/custom/spamassassin/custom.cf`
+too. For example:
+
+```
+trusted_networks 192.168.0.1 172.16.0.0/8
+```
+
 ### Roundcube Webmail
 
 * Copy custom settings from `/opt/www/roundcubemail/config/config.inc.php` to `/opt/iredmail/custom/roundcube/config/custom.inc.php`.
@@ -172,6 +181,15 @@ Split custom settings from `/etc/mail/spamassassin/local.cf` to
 
 Copy custom settings from `/opt/iredapd/settings.py` to `/opt/iredmail/custom/iredapd/settings.py`.
 
+If you have whitelisted IP addresses/networks listed in Postfix config file
+`/etc/postfix/main.cf`, parameter `mynetworks =`, you may want to whitelist
+them to avoid greylisting or other access control in `/opt/iredmail/custom/iredapd/settings.py`
+too. For example:
+
+```
+MYNEWTORKS = ['192.168.0.1', '172.16.0.0/8']
+```
+
 ### iRedAdmin(-Pro)
 
 Copy custom settings from `/opt/www/iredadmin/settings.py` to `/opt/iredmail/custom/iredadmin/settings.py`.
diff --git a/html/migrate.to.iredmail.easy.html b/html/migrate.to.iredmail.easy.html
index 8290d3b7..7888e54a 100644
--- a/html/migrate.to.iredmail.easy.html
+++ b/html/migrate.to.iredmail.easy.html
@@ -299,6 +299,13 @@ details, please check our
 <h3 id="spamassassin">SpamAssassin</h3>
 <p>Split custom settings from <code>/etc/mail/spamassassin/local.cf</code> to
 <code>/opt/iredmail/custom/spamassassin/custom.cf</code>.</p>
+<p>If you have whitelisted IP addresses/networks listed in Postfix config file
+<code>/etc/postfix/main.cf</code>, parameter <code>mynetworks =</code>, you may want to whitelist
+them to avoid spam/virus scanning in <code>/opt/iredmail/custom/spamassassin/custom.cf</code>
+too. For example:</p>
+<pre><code>trusted_networks 192.168.0.1 172.16.0.0/8
+</code></pre>
+
 <h3 id="roundcube-webmail">Roundcube Webmail</h3>
 <ul>
 <li>Copy custom settings from <code>/opt/www/roundcubemail/config/config.inc.php</code> to <code>/opt/iredmail/custom/roundcube/config/custom.inc.php</code>.</li>
@@ -307,6 +314,13 @@ details, please check our
 </ul>
 <h3 id="iredapd">iRedAPD</h3>
 <p>Copy custom settings from <code>/opt/iredapd/settings.py</code> to <code>/opt/iredmail/custom/iredapd/settings.py</code>.</p>
+<p>If you have whitelisted IP addresses/networks listed in Postfix config file
+<code>/etc/postfix/main.cf</code>, parameter <code>mynetworks =</code>, you may want to whitelist
+them to avoid greylisting or other access control in <code>/opt/iredmail/custom/iredapd/settings.py</code>
+too. For example:</p>
+<pre><code>MYNEWTORKS = ['192.168.0.1', '172.16.0.0/8']
+</code></pre>
+
 <h3 id="iredadmin-pro">iRedAdmin(-Pro)</h3>
 <p>Copy custom settings from <code>/opt/www/iredadmin/settings.py</code> to <code>/opt/iredmail/custom/iredadmin/settings.py</code>.</p>
 <h2 id="run-the-full-deployment-with-iredmail-easy-platform">Run the full deployment with iRedMail Easy platform</h2>