From 9fdae35cfe3c2ba635a6925ff0151c7c5e8cd9fb Mon Sep 17 00:00:00 2001
From: Zhang Huangbin
Date: Mon, 15 Feb 2016 19:45:31 +0800
Subject: [PATCH] Typo.
---
TODO.md | 7 +++--
en_US/howto/manage.iredapd.md | 50 ++++++++++++++++--------------
html/manage.iredapd.html | 58 ++++++++++++++++++++---------------
3 files changed, 64 insertions(+), 51 deletions(-)
diff --git a/TODO.md b/TODO.md
index bb043a53..e3ee7bae 100644
--- a/TODO.md
+++ b/TODO.md
@@ -5,11 +5,12 @@
* http://doc.samplezone.ch/iredmail/version-0-9-1/programs/program-sockets/
* http://doc.samplezone.ch/iredmail/
-* How to install and configure SOGo groupware
-* How to install and configure Nginx
-* How to custom SpamAssassin scores
* How to install and configure mlmmj (mailing list management tool)
* 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
* http://www.iredmail.org/forum/topic210-iredmail-support-faq-how-to-enable-signing-disclaimer-on-outgoing-mails.html
+
+* Update iRedMail installation document to use loopback interface in FreeBSD
+ Jail, so that we don't need `LOCAL_ADDRESS=` while launching iRedMail installer:
+ https://www.freebsd.org/doc/handbook/jails-ezjail.html
diff --git a/en_US/howto/manage.iredapd.md b/en_US/howto/manage.iredapd.md
index 6cdbdae9..30aebf30 100644
--- a/en_US/howto/manage.iredapd.md
+++ b/en_US/howto/manage.iredapd.md
@@ -21,14 +21,7 @@ To disable iRedAPD service:
1. Restart or reload Postfix service.
1. Disable iredapd service.
-## Manage white/blacklists
-
-> * White/blacklisting is available in iRedAPD-1.4.4 and later releases.
-> * Script `tools/wblist_admin.py` is available in iRedAPD-1.7.0 and later releases.
-
-White/blacklisting is controlled by plugin `amavisd_wblist` (file
-`/opt/iredapd/plugins/amavisd_wblist.py`), you can manage it with script
-`/opt/iredapd/tools/wblist_admin.py`.
+## White/Blacklisting
### How to disable white/blacklists completely
@@ -42,7 +35,16 @@ plugins = [..., 'amavisd_wblist', ...]
Restarting iRedAPD service is required.
-### Available arguments
+### Manage white/blacklists
+
+> * White/blacklisting is available in iRedAPD-1.4.4 and later releases.
+> * Script `tools/wblist_admin.py` is available in iRedAPD-1.7.0 and later releases.
+
+White/blacklisting is controlled by plugin `amavisd_wblist` (file
+`/opt/iredapd/plugins/amavisd_wblist.py`), you can manage it with script
+`/opt/iredapd/tools/wblist_admin.py`.
+
+#### Available arguments
```
--outbound
@@ -85,7 +87,7 @@ Restarting iRedAPD service is required.
Don't ask to confirm.
```
-### Sample usages
+#### Sample usages
* Show and add server-wide whitelists or blacklists:
@@ -107,15 +109,7 @@ Restarting iRedAPD service is required.
# python wblist_admin.py --account user@mydomain.com --list --blacklist
```
-## Manage greylisting settings
-
-> * Greylisting is available in iRedAPD-1.7.0 and later releases.
-> * Script `tools/greylisting_admin.py` is available in iRedAPD-1.8.0 and
-> later releases.
-
-Greylisting is controlled by plugin `greylisting` (file
-`/opt/iredapd/plugins/greylisting.py`), you can manage it with script
-`/opt/iredapd/tools/greylisting_admin.py`.
+## Greylisting
### How to disable greylisting completely
@@ -128,7 +122,17 @@ plugins = [..., 'greylisting', ...]
Restarting iRedAPD service is required.
-### Available arguments
+### Manage greylisting settings
+
+> * Greylisting is available in iRedAPD-1.7.0 and later releases.
+> * Script `tools/greylisting_admin.py` is available in iRedAPD-1.8.0 and
+> later releases.
+
+Greylisting is controlled by plugin `greylisting` (file
+`/opt/iredapd/plugins/greylisting.py`), you can manage it with script
+`/opt/iredapd/tools/greylisting_admin.py`.
+
+#### Available arguments
```
--list
@@ -158,7 +162,7 @@ Restarting iRedAPD service is required.
Delete specified greylisting setting.
```
-### Sample usages
+#### Sample usages
* List all existing greylisting settings
@@ -191,7 +195,7 @@ Restarting iRedAPD service is required.
# python greylisting_admin.py --delete --to '@test.com'
```
-### Additional greylisting whitelist support
+#### RECOMMENDED: Additional greylisting whitelist support
Seems many companies setup their mail servers to re-deliver returned email
immediately from another server, this causes trouble with greylisting.
@@ -199,7 +203,7 @@ immediately from another server, this causes trouble with greylisting.
Possible solutions:
1. Disable greylisting on your server completely.
-2. Whitelist IP addresses/networks of their mail servers.
+1. Whitelist IP addresses/networks of their mail servers.
For solution #2, you can whitelist those mail servers with script
`/opt/iredapd/tools/spf_to_greylit_whitelists.py`.
diff --git a/html/manage.iredapd.html b/html/manage.iredapd.html
index b3751973..9eb4b543 100644
--- a/html/manage.iredapd.html
+++ b/html/manage.iredapd.html
@@ -16,17 +16,23 @@
Manage iRedAPD (white/blacklists, greylisting)
Restart or reload Postfix service.
Disable iredapd service.
-Manage white/blacklists
+White/Blacklisting
+How to disable white/blacklists completely
+To disable white/blacklists completely, please remove plugin name
+amavisd_wblist
in iRedAPD config file /opt/iredapd/settings.py
,
+parameter plugins =
:
+plugins = [..., 'amavisd_wblist', ...]
+
+
+Restarting iRedAPD service is required.
+Manage white/blacklists
- White/blacklisting is available in iRedAPD-1.4.4 and later releases.
@@ -60,15 +75,7 @@ user iredapd
.
White/blacklisting is controlled by plugin amavisd_wblist
(file
/opt/iredapd/plugins/amavisd_wblist.py
), you can manage it with script
/opt/iredapd/tools/wblist_admin.py
.
-How to disable white/blacklists completely
-To disable white/blacklists completely, please remove plugin name
-amavisd_wblist
in iRedAPD config file /opt/iredapd/settings.py
,
-parameter plugins =
:
-
plugins = [..., 'amavisd_wblist', ...]
-
-
-Restarting iRedAPD service is required.
-Available arguments
+Available arguments
--outbound
Manage white/blacklist for outbound messages.
@@ -109,7 +116,7 @@ parameter plugins =
:
Don't ask to confirm.
-Sample usages
+Sample usages
- Show and add server-wide whitelists or blacklists:
@@ -130,7 +137,15 @@ parameter plugins =
:
# python wblist_admin.py --account user@mydomain.com --list --blacklist
-Manage greylisting settings
+Greylisting
+How to disable greylisting completely
+To disable greylisting completely, please remove plugin name greylisting
+in iRedAPD config file /opt/iredapd/settings.py
, parameter plugins =
:
+plugins = [..., 'greylisting', ...]
+
+
+Restarting iRedAPD service is required.
+Manage greylisting settings
- Greylisting is available in iRedAPD-1.7.0 and later releases.
@@ -141,14 +156,7 @@ parameter plugins =
:
Greylisting is controlled by plugin greylisting
(file
/opt/iredapd/plugins/greylisting.py
), you can manage it with script
/opt/iredapd/tools/greylisting_admin.py
.
-How to disable greylisting completely
-To disable greylisting completely, please remove plugin name greylisting
-in iRedAPD config file /opt/iredapd/settings.py
, parameter plugins =
:
-
plugins = [..., 'greylisting', ...]
-
-
-Restarting iRedAPD service is required.
-Available arguments
+Available arguments
--list
Show ALL existing greylisting settings.
@@ -176,7 +184,7 @@ in iRedAPD config file /opt/iredapd/settings.py
, parameter pl
Delete specified greylisting setting.
-Sample usages
+Sample usages
- List all existing greylisting settings
@@ -208,7 +216,7 @@ in iRedAPD config file /opt/iredapd/settings.py
, parameter pl
# python greylisting_admin.py --delete --to '@test.com'
-Additional greylisting whitelist support
+RECOMMENDED: Additional greylisting whitelist support
Seems many companies setup their mail servers to re-deliver returned email
immediately from another server, this causes trouble with greylisting.
Possible solutions: