diff --git a/en_US/upgrade/0-upgrade.iredapd.md b/en_US/upgrade/0-upgrade.iredapd.md
index 33d8aa63..c473f9f0 100644
--- a/en_US/upgrade/0-upgrade.iredapd.md
+++ b/en_US/upgrade/0-upgrade.iredapd.md
@@ -12,10 +12,15 @@ This tutorial describes how to upgrade iRedAPD from `1.4.0` or later releases
to the latest stable release. It's applicable on all Linux/BSD distributions
supported by iRedMail.
-* Download the latest stable release here: [http://www.iredmail.org/yum/misc/](http://www.iredmail.org/yum/misc/)
- For example, iRedAPD-1.6.0.tar.bz2.
-* Upload it to your iRedMail server. Assume it's `/root/iRedAPD-1.6.0.tar.bz2`.
-* Extract downloaded package and execute upgrade script:
+1. Download the latest stable release here: .
+ For example, iRedAPD-1.6.0.tar.bz2.
+1. Upload it to your iRedMail server. Assume it's `/root/iRedAPD-1.6.0.tar.bz2`.
+1. Extract downloaded package and execute upgrade script:
+
+> Note: If you're running iRedMail with OpenLDAP or MySQL/MariaDB backend,
+> upgrading from iRedAPD-1.6.0 or earlier releases to the latest iRedAPD-1.7.0
+> requires MySQL root username and password, please get them before you run
+> upgrade script.
```
# cd /root
@@ -31,11 +36,7 @@ That's all.
Important notes:
* It's recommended to enable plugin `reject_null_sender` in iRedAPD-1.4.4 or
- newer releases to prevent authenticated user sending spam as null sender.
+ later releases to prevent authenticated user sending spam as null sender.
* Plugin `amavisd_wblist` is required if you manage white/blacklists with
iRedAdmin-Pro.
-
-# See Also
-
-* iRedAPD source code is hosted on [BitBucket](https://bitbucket.org/zhb/iredapd/).
diff --git a/en_US/upgrade/3-iredapd.releases.md b/en_US/upgrade/3-iredapd.releases.md
index 2d377570..c910ce1a 100644
--- a/en_US/upgrade/3-iredapd.releases.md
+++ b/en_US/upgrade/3-iredapd.releases.md
@@ -5,7 +5,7 @@
> Download the [latest iRedAPD stable release](https://bitbucket.org/zhb/iredapd/downloads).
> If you want to develop your own plugin for iRedAPD, please read document
-> [README_PLUGINS.md](https://bitbucket.org/zhb/iredapd/src/default/README_PLUGINS.md?at=default) in iRedAPD source code.
+> [README_PLUGINS.md](https://bitbucket.org/zhb/iredapd/src/default/README_PLUGINS.md) in iRedAPD source code.
## Upgrade iRedAPD
@@ -13,69 +13,5 @@
## ChangeLog
-### 1.6.0
-
-* New setting: `MYNETWORKS`. used to set trusted or internal networks.
-* Plugin `ldap_domain_wblist` was removed, we didn't use it at all.
-* Fixed issues:
-
- * plugin/ldap_maillist_access_policy.py: not use correct ldap
- connection cursor. this causes access policy not work.
- * plugin/reject_sender_login_mismatch.py: Not return correct value for
- allowed senders.
- * Not correctly fetch SQL query result with SQLAlchemy.
- * Doesn't work with PostgreSQL backend.
- * iRedAPD daemon exits with error (9, 'Bad file descriptor').
-
-### 1.5.0
-
-* Improvements:
-
- * Use sql connection pool provided by SQLAlchemy for better performance.
- * Log reject and other non-DUNNO actions in iredadmin database (`log_action_in_db = True`).
- * Plugin `amavisd_wblist`: able to use `user@*` as white/blacklist sender.
- * Plugin `sql_alias_access_policy` and `ldap_maillist_access_policy`:
- able to use `*@domain.com` (all senders from `domain.com`) as
- moderator.
- * Plugin `reject_sender_login_mismatch`:
-
- * New optional setting `ALLOWED_LOGIN_MISMATCH_LIST_MEMBER`, used to
- allow member of mail list/alias to send as mail list/alias.
- Default is False.
- * Setting `ALLOWED_LOGIN_MISMATCH_SENDERS` is now optional.
-
- * Log smtp protocol state in log file (`RCPT`, `END-OF-MESSAGE`).
-
-* Fixed issues:
-
- * Plugin `amavisd_message_size_limit`: just use the first valid
- policy (with highest priority) and skip rest.
- * Plugin `reject_sender_login_mismatch`: not reject email if sender
- is forged address (sender domain is hosted locally).
- * Not close sql connection explicitly.
-
-### 1.4.5
-
-* Improvements:
-
- * Log non-DUNNO actions in iredadmin database (with setting
- `log_action_in_db = True` in iRedAPD config file).
- * plugin/amavisd_wblist.py: able to use `user@*` as white/blacklist sender.
- * plugin/sql_alias_access_policy.py, plugin/ldap_maillist_access_policy:
- able to use `*@domain.com` (all senders from `domain.com`) as moderator.
- * plugin/reject_sender_login_mismatch.py:
-
- * New optional setting `ALLOWED_LOGIN_MISMATCH_LIST_MEMBER`, used to
- allow member of mail list/alias to send as mail list/alias.
- Default is False.
-
- * Setting `ALLOWED_LOGIN_MISMATCH_SENDERS` is now optional.
-
- * Log smtp protocol state in log file.
-
-* Fixed issues:
- * plugin/amavisd_message_size_limit.py: just use the first valid
- policy (with highest priority) and skip rest.
- * plugin/reject_sender_login_mismatch.py: not reject email if sender
- is forged address (sender domain is hosted locally).
- * Not close sql connection explicitly.
+Please check [ChangeLog](https://bitbucket.org/zhb/iredapd/src/default/ChangeLog)
+file in iRedAPD source code to check full, detailed changes in each release.
diff --git a/html/iredapd.releases.html b/html/iredapd.releases.html
index 2e679c81..a2c3461a 100644
--- a/html/iredapd.releases.html
+++ b/html/iredapd.releases.html
@@ -15,103 +15,13 @@
iRedAPD source code is hosted on BitBucket.
Download the latest iRedAPD stable release.
If you want to develop your own plugin for iRedAPD, please read document
-README_PLUGINS.md in iRedAPD source code.
+README_PLUGINS.md in iRedAPD source code.
Upgrade iRedAPD
How to upgrade iRedAPD-1.4.0 or later versions to the latest stable release
ChangeLog
-1.6.0
-
-- New setting:
MYNETWORKS
. used to set trusted or internal networks.
-- Plugin
ldap_domain_wblist
was removed, we didn't use it at all.
--
-
Fixed issues:
-
-- plugin/ldap_maillist_access_policy.py: not use correct ldap
- connection cursor. this causes access policy not work.
-- plugin/reject_sender_login_mismatch.py: Not return correct value for
- allowed senders.
-- Not correctly fetch SQL query result with SQLAlchemy.
-- Doesn't work with PostgreSQL backend.
-- iRedAPD daemon exits with error (9, 'Bad file descriptor').
-
-
-
-1.5.0
-
--
-
Improvements:
-
-
--
-
Fixed issues:
-
-- Plugin
amavisd_message_size_limit
: just use the first valid
- policy (with highest priority) and skip rest.
-- Plugin
reject_sender_login_mismatch
: not reject email if sender
- is forged address (sender domain is hosted locally).
-- Not close sql connection explicitly.
-
-
-
-1.4.5
-
--
-
Improvements:
-
-
--
-
Fixed issues:
-
-- plugin/amavisd_message_size_limit.py: just use the first valid
- policy (with highest priority) and skip rest.
-- plugin/reject_sender_login_mismatch.py: not reject email if sender
- is forged address (sender domain is hosted locally).
-- Not close sql connection explicitly.
-
-
-
Document published under a CC BY-ND 3.0 license. If you found something wrong, please do contact us to fix it.