From 817d71117f668810f5efcc6461cdfd8999bfc1ce Mon Sep 17 00:00:00 2001
From: Zhang Huangbin
Date: Thu, 28 Jul 2016 21:08:11 +0800
Subject: [PATCH 1/3] Fix typo in
en_US/howto/1-completely.disable.amavisd.clamav.spamassassin.md: singing ->
signing.
---
en_US/howto/1-completely.disable.amavisd.clamav.spamassassin.md | 2 +-
html/completely.disable.amavisd.clamav.spamassassin.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/en_US/howto/1-completely.disable.amavisd.clamav.spamassassin.md b/en_US/howto/1-completely.disable.amavisd.clamav.spamassassin.md
index 33f7716d..9e73b0d7 100644
--- a/en_US/howto/1-completely.disable.amavisd.clamav.spamassassin.md
+++ b/en_US/howto/1-completely.disable.amavisd.clamav.spamassassin.md
@@ -6,7 +6,7 @@ In iRedMail, Amavisd provides below features:
* content-based spam scanning (invoke SpamAssassin)
* Virus scanning (invoke ClamAV)
-* DKIM singing
+* DKIM signing
* DKIM verification (through SpamAssassin + Perl module)
* SPF verification (through SpamAssassin + Perl module)
* Disclaimer (throught AlterMIME)
diff --git a/html/completely.disable.amavisd.clamav.spamassassin.html b/html/completely.disable.amavisd.clamav.spamassassin.html
index 829452a2..35dd1e9c 100644
--- a/html/completely.disable.amavisd.clamav.spamassassin.html
+++ b/html/completely.disable.amavisd.clamav.spamassassin.html
@@ -33,7 +33,7 @@
- content-based spam scanning (invoke SpamAssassin)
- Virus scanning (invoke ClamAV)
-- DKIM singing
+- DKIM signing
- DKIM verification (through SpamAssassin + Perl module)
- SPF verification (through SpamAssassin + Perl module)
- Disclaimer (throught AlterMIME)
From 67532862c2c7ab8d455a2952fa8f2c51691d47e0 Mon Sep 17 00:00:00 2001
From: Zhang Huangbin
Date: Sat, 30 Jul 2016 10:45:36 +0800
Subject: [PATCH 2/3] Typo in en_US/faq/1-errors.md.
---
en_US/faq/1-errors.md | 34 ++++++++++++++++++----------------
html/css/markdown.css | 1 +
html/errors.html | 36 ++++++++++++++++++++----------------
3 files changed, 39 insertions(+), 32 deletions(-)
diff --git a/en_US/faq/1-errors.md b/en_US/faq/1-errors.md
index 9cfafd20..08c000f7 100644
--- a/en_US/faq/1-errors.md
+++ b/en_US/faq/1-errors.md
@@ -4,13 +4,27 @@
## Postfix
+### Intended policy rejection, please try again later
+
+Sample error message in Postfix log file:
+
+> Jul 24 06:43:08 mx0 postfix/smtpd[12719]: NOQUEUE: reject: RCPT from sender.com[xx.xx.xx.xx]: 451 4.7.1 : Recipient address rejected: __Intentional policy rejection, please try again later__{: .red }; from= to= proto=SMTP helo=
+
+This error is caused by greylisting service, sender server will retry to
+deliver the same email, and your server will accept it after few retries.
+
+* For more technical details about Greylisting, please visit:
+ * [Homepage: What is greylisting?](http://greylisting.org)
+ * [Articles about greylisting](http://greylisting.org/articles/)
+* To manage greylisting service, please read iRedAPD tutorial: [Manage iRedAPD: Greylisting](./manage.iredapd.html#feature-greylisting)
+
### Sender address rejected: not logged in
Sample error message in Postfix log file:
> Jun 24 11:57:13 mx1 postfix/smtpd[2667]: NOQUEUE: reject: RCPT from
-> mail.mydomain.com[1.2.3.4]: 553 5.7.1 : Sender address
-> rejected: not logged in; from=
+> mail.mydomain.com[1.2.3.4]: 553 5.7.1 : __Sender address
+> rejected: not logged in__{: .red }; from=
> to= proto=ESMTP helo=
This error is caused by incorrectly configured mail client application, not a
@@ -57,8 +71,8 @@ this issue.
Sample error message in Postfix log file:
> Feb 11 19:59:06 mail postfix/cleanup[30575]: warning: 23C334232FB3:
-> unreasonable virtual_alias_maps map expansion size for user@domain.com
-> -- deferring delivery
+> __unreasonable virtual_alias_maps map expansion size__{: .red } for
+> user@domain.com -- deferring delivery
It means the maximal number of addresses that virtual alias expansion produces
from each original recipient exceeds hard limit, please either increase the
@@ -73,18 +87,6 @@ virtual_alias_expansion_limit = 1500
Reference: [Postfix Configuration Parameters](http://www.postfix.org/postconf.5.html#virtual_alias_expansion_limit)
-### Intentional policy rejection, please try again later
-
-Sample error message in Postfix log file:
-
-> May 15 15:59:27 mail postfix/smtpd[8451]: NOQUEUE: reject: RCPT from smtpweb149.aruba.it[62.149.158.149]: 451 4.7.1 : Recipient address rejected: Intentional policy rejection, please try again later; from= to= proto=ESMTP helo=
-
-This is caused by greylisting service, sender server will retry delivery, and
-you will receive the email in few minutes to 30 minutes.
-
-* For more technical details about Greylisting, please visit: .
-* To manage greylisting service, please read iRedAPD tutorial: [Manage iRedAPD: Greylisting](./manage.iredapd.html#feature-greylisting)
-
## Amavisd
### connect to 127.0.0.1[127.0.0.1]:10024: Connection refused
diff --git a/html/css/markdown.css b/html/css/markdown.css
index 27361c96..0e3e812d 100755
--- a/html/css/markdown.css
+++ b/html/css/markdown.css
@@ -314,6 +314,7 @@ pre>code {
th { font-style: bold; text-align: left; }
+.red { color: red; }
/*
code.bash { background-color: green; color: white; }
*/
diff --git a/html/errors.html b/html/errors.html
index 3537c851..f6e561ef 100644
--- a/html/errors.html
+++ b/html/errors.html
@@ -20,10 +20,10 @@
- Errors you may see while maintaining iRedMail server
- Postfix
- Amavisd
Postfix
+Intended policy rejection, please try again later
+Sample error message in Postfix log file:
+
+Jul 24 06:43:08 mx0 postfix/smtpd[12719]: NOQUEUE: reject: RCPT from sender.com[xx.xx.xx.xx]: 451 4.7.1 recipient@my-domain.com: Recipient address rejected: Intentional policy rejection, please try again later; from=sender@sender-domain.com to=recipient@my-domain.com proto=SMTP helo=
+
+This error is caused by greylisting service, sender server will retry to
+deliver the same email, and your server will accept it after few retries.
+
+- For more technical details about Greylisting, please visit:
+
+- To manage greylisting service, please read iRedAPD tutorial: Manage iRedAPD: Greylisting
+
Sender address rejected: not logged in
Sample error message in Postfix log file:
Jun 24 11:57:13 mx1 postfix/smtpd[2667]: NOQUEUE: reject: RCPT from
-mail.mydomain.com[1.2.3.4]: 553 5.7.1 <sombody@my-domain.com>: Sender address
-rejected: not logged in; from=<sombody@my-domain.com>
+mail.mydomain.com[1.2.3.4]: 553 5.7.1 <sombody@my-domain.com>: Sender address
+rejected: not logged in; from=<sombody@my-domain.com>
to=<receipent@receipentdomain.com> proto=ESMTP helo=<client_helo.com>
This error is caused by incorrectly configured mail client application, not a
@@ -78,8 +93,8 @@ restart iRedAPD service. That's all.
Sample error message in Postfix log file:
Feb 11 19:59:06 mail postfix/cleanup[30575]: warning: 23C334232FB3:
-unreasonable virtual_alias_maps map expansion size for user@domain.com
--- deferring delivery
+unreasonable virtual_alias_maps map expansion size for
+user@domain.com -- deferring delivery
It means the maximal number of addresses that virtual alias expansion produces
from each original recipient exceeds hard limit, please either increase the
@@ -90,17 +105,6 @@ Postfix config file /etc/postfix/main.cf
:
Reference: Postfix Configuration Parameters
-Intentional policy rejection, please try again later
-Sample error message in Postfix log file:
-
-May 15 15:59:27 mail postfix/smtpd[8451]: NOQUEUE: reject: RCPT from smtpweb149.aruba.it[62.149.158.149]: 451 4.7.1 rcpt@mydomain.com: Recipient address rejected: Intentional policy rejection, please try again later; from=sender@sender_domain.com to=rcpt@mydomain proto=ESMTP helo=
-
-This is caused by greylisting service, sender server will retry delivery, and
-you will receive the email in few minutes to 30 minutes.
-
Amavisd
connect to 127.0.0.1[127.0.0.1]:10024: Connection refused
This error means Amavisd service is not running, please try to start it first.
From 9ba0d13846b349fa28214eb7befee3d1569d9d2d Mon Sep 17 00:00:00 2001
From: Zhang Huangbin
Date: Sat, 30 Jul 2016 16:52:42 +0800
Subject: [PATCH 3/3] Update iRedAdmin-Pro API: able to enable/disable and
remove all enabled per-domain services.
---
en_US/faq/2-iredadmin-pro.restful.api.md | 12 +++++++++
html/iredadmin-pro.restful.api.html | 33 ++++++++++++++++++++++++
2 files changed, 45 insertions(+)
diff --git a/en_US/faq/2-iredadmin-pro.restful.api.md b/en_US/faq/2-iredadmin-pro.restful.api.md
index b86ea5d9..225bdd56 100644
--- a/en_US/faq/2-iredadmin-pro.restful.api.md
+++ b/en_US/faq/2-iredadmin-pro.restful.api.md
@@ -112,6 +112,18 @@ Notes:
+!!! api "`PUT`{: .put } `/api/domain/services/`{: .url } `Update enabled per-domain services`{: .comment } `upcoming`{: .upcoming } `Parameters`{: .has_params }"
+
+
+
+ Parameter Name | Summary | Sample Usage
+ --- |--- |---
+ `enableService` | Enable new services | `enableService=sogo,vpn,xmpp`
+ `disableService` | Disable existing services | `disableService=sogo,vpn,xmpp`
+ `removeAllServices` | Disable all services (including mail service) | `removeAllServices=`
+
+
+
### User {: .toggle }
!!! api "`POST`{: .post } `/api/user/`{: .url } `Create a new mail user`{: .comment } `Parameters`{: .has_params }"
diff --git a/html/iredadmin-pro.restful.api.html b/html/iredadmin-pro.restful.api.html
index eb11bb2d..9353f802 100644
--- a/html/iredadmin-pro.restful.api.html
+++ b/html/iredadmin-pro.restful.api.html
@@ -258,6 +258,39 @@ RESTFUL_API_CLIENTS = ['172.16.244.1', ...]
+
+
+
PUT
/api/domain/services/<domain>
upcoming
Parameters
+
+
+
+
+
+Parameter Name |
+Summary |
+Sample Usage |
+
+
+
+
+enableService |
+Enable new services |
+enableService=sogo,vpn,xmpp |
+
+
+disableService |
+Disable existing services |
+disableService=sogo,vpn,xmpp |
+
+
+removeAllServices |
+Disable all services (including mail service) |
+removeAllServices= |
+
+
+
+
+
User