From 9009735a6baaa36ab504c42af2eb38a0dceece04 Mon Sep 17 00:00:00 2001
From: Zhang Huangbin
Date: Fri, 6 Apr 2018 08:22:30 +0200
Subject: [PATCH] Mention Upgrade Dovecot from 2.2 to 2.3 for FreeBSD in
iRedMail upgrade tutorial.
---
en_US/upgrade/0-upgrade.dovecot.2.2-2.3.md | 4 ++++
en_US/upgrade/0-upgrade.iredmail.0.9.7-0.9.8.md | 14 ++++++++++++++
html/upgrade.dovecot.2.2-2.3.html | 8 +++++++-
html/upgrade.iredmail.0.9.7-0.9.8.html | 13 +++++++++++++
4 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/en_US/upgrade/0-upgrade.dovecot.2.2-2.3.md b/en_US/upgrade/0-upgrade.dovecot.2.2-2.3.md
index c45cc32e..f518ecaf 100644
--- a/en_US/upgrade/0-upgrade.dovecot.2.2-2.3.md
+++ b/en_US/upgrade/0-upgrade.dovecot.2.2-2.3.md
@@ -28,6 +28,10 @@ cd /etc/dovecot/
```
* On FreeBSD:
+ * Please upgrade ports `mail/dovecot` and `mail/dovecot-pigeonhole` first.
+ You can use tool like `portmaster` or `portupgrade` for this purpose.
+ FYI: [Using the Ports Collection](https://www.freebsd.org/doc/handbook/ports-using.html)
+ * After upgraded both ports, please run:
```
cd /usr/local/etc/dovecot/
diff --git a/en_US/upgrade/0-upgrade.iredmail.0.9.7-0.9.8.md b/en_US/upgrade/0-upgrade.iredmail.0.9.7-0.9.8.md
index 4b0b1b09..9dc7830c 100644
--- a/en_US/upgrade/0-upgrade.iredmail.0.9.7-0.9.8.md
+++ b/en_US/upgrade/0-upgrade.iredmail.0.9.7-0.9.8.md
@@ -83,6 +83,20 @@ you want to try v4, please follow our tutorial below to upgrade it.
* [Upgrade SOGo from v3 to v4](./upgrade.sogo.3.to.4.html)
+### Upgrade Dovecot from 2.2 to 2.3
+
+!!! attention
+
+ This is only applicable to FreeBSD.
+
+Currently only FreeBSD offers Dovecot 2.3 by the ports tree, other Linux/BSD
+distributions still offers Dovecot 2.2, you should stick to Dovecot 2.2 if your
+Linux/BSD vendor doesn't offer 2.3 yet.
+
+Please follow our tutorial below to upgrade Dovecot:
+
+* [Upgrade Dovecot from 2.2.x to 2.3.x](./upgrade.dovecot.2.2-2.3.html)
+
### Fixed: SOGo backup script contains 3 issues
SOGo backup script `/var/vmail/backup/backup_sogo.sh` shipped in iRedMail-0.9.7
diff --git a/html/upgrade.dovecot.2.2-2.3.html b/html/upgrade.dovecot.2.2-2.3.html
index 747a7f93..790aa6e6 100644
--- a/html/upgrade.dovecot.2.2-2.3.html
+++ b/html/upgrade.dovecot.2.2-2.3.html
@@ -40,7 +40,13 @@ convert your Dovecot 2.2 config file to fully work with Dovecot 2.3.
-- On FreeBSD:
+- On FreeBSD:
+- Please upgrade ports
mail/dovecot
and mail/dovecot-pigeonhole
first.
+ You can use tool like portmaster
or portupgrade
for this purpose.
+ FYI: Using the Ports Collection
+- After upgraded both ports, please run:
+
+
cd /usr/local/etc/dovecot/
diff --git a/html/upgrade.iredmail.0.9.7-0.9.8.html b/html/upgrade.iredmail.0.9.7-0.9.8.html
index ef542f1e..cfb39539 100644
--- a/html/upgrade.iredmail.0.9.7-0.9.8.html
+++ b/html/upgrade.iredmail.0.9.7-0.9.8.html
@@ -26,6 +26,7 @@
Upgrade iRedAdmin (open source edition) to the latest stable release (0.9)
Upgrade Roundcube webmail to the latest stable release (1.3.5)
Upgrade SOGo from v3 to v4
+Upgrade Dovecot from 2.2 to 2.3
Fixed: SOGo backup script contains 3 issues
Fail2ban: new jail postfix-pregreet
Fixed: Nginx snippet file hard-codes static file types for iRedAdmin
@@ -133,6 +134,18 @@ you want to try v4, please follow our tutorial below to upgrade it.
+Upgrade Dovecot from 2.2 to 2.3
+
+
Attention
+
This is only applicable to FreeBSD.
+
+Currently only FreeBSD offers Dovecot 2.3 by the ports tree, other Linux/BSD
+distributions still offers Dovecot 2.2, you should stick to Dovecot 2.2 if your
+Linux/BSD vendor doesn't offer 2.3 yet.
+Please follow our tutorial below to upgrade Dovecot:
+
Fixed: SOGo backup script contains 3 issues
SOGo backup script /var/vmail/backup/backup_sogo.sh
shipped in iRedMail-0.9.7
and earlier releases contains 3 issues: