From c58308145251783ff3cf6467c64e81f8bb5e04ae Mon Sep 17 00:00:00 2001 From: Zhang Huangbin Date: Thu, 1 Nov 2018 20:42:19 +0100 Subject: [PATCH] Sync iRedMail upgrade tutorial. --- .../integrations/0-integration.mlmmj.ldap.md | 12 ++--- .../integrations/0-integration.mlmmj.mysql.md | 12 ++--- .../integrations/0-integration.mlmmj.pgsql.md | 12 ++--- .../upgrade/0-upgrade.iredmail.0.9.8-0.9.9.md | 51 ++++++++++++++----- html/integration.mlmmj.ldap.html | 12 ++--- html/integration.mlmmj.mysql.html | 12 ++--- html/integration.mlmmj.pgsql.html | 12 ++--- html/upgrade.iredmail.0.9.8-0.9.9.html | 42 ++++++++++----- 8 files changed, 103 insertions(+), 62 deletions(-) diff --git a/en_US/integrations/0-integration.mlmmj.ldap.md b/en_US/integrations/0-integration.mlmmj.ldap.md index c854a8f0..925f1c04 100644 --- a/en_US/integrations/0-integration.mlmmj.ldap.md +++ b/en_US/integrations/0-integration.mlmmj.ldap.md @@ -152,7 +152,7 @@ query_filter = (&(|(objectClass=mailUser)(&(objectClass=mailList)(enabledServ ``` * Run commands below to create file `/usr/bin/mlmmj-amime-receive` (Linux) or - `/usr/local/bin/mlmmj-amime-receive` (Linux/FreeBSD): + `/usr/local/bin/mlmmj-amime-receive` (FreeBSD/OpenBSD): !!! attention @@ -230,14 +230,14 @@ We will setup `mlmmjadmin` program to make managing mailing lists easier. !!! attention - We use version `1.8` for example below. + We use version `1.9` for example below. ``` cd /root/ -wget https://github.com/iredmail/mlmmjadmin/archive/1.8.tar.gz -tar zxf 1.8.tar.gz -C /opt -rm -f 1.8.tar.gz -ln -s /opt/mlmmjadmin-1.8 /opt/mlmmjadmin +wget https://github.com/iredmail/mlmmjadmin/archive/1.9.tar.gz +tar zxf 1.9.tar.gz -C /opt +rm -f 1.9.tar.gz +ln -s /opt/mlmmjadmin-1.9 /opt/mlmmjadmin ``` * Generate config file by copying sample file, `settings.py.sample`: diff --git a/en_US/integrations/0-integration.mlmmj.mysql.md b/en_US/integrations/0-integration.mlmmj.mysql.md index ee2a8143..49980029 100644 --- a/en_US/integrations/0-integration.mlmmj.mysql.md +++ b/en_US/integrations/0-integration.mlmmj.mysql.md @@ -170,7 +170,7 @@ query = SELECT maillists.transport FROM maillists,domain WHERE maillists.a ``` * Run commands below to create file `/usr/bin/mlmmj-amime-receive` (Linux) or - `/usr/local/bin/mlmmj-amime-receive` (Linux/FreeBSD): + `/usr/local/bin/mlmmj-amime-receive` (FreeBSD/OpenBSD): !!! attention @@ -248,14 +248,14 @@ We will setup `mlmmjadmin` program to make managing mailing lists easier. !!! attention - We use version `1.8` for example below. + We use version `1.9` for example below. ``` cd /root/ -wget https://github.com/iredmail/mlmmjadmin/archive/1.8.tar.gz -tar zxf 1.8.tar.gz -C /opt -rm -f 1.8.tar.gz -ln -s /opt/mlmmjadmin-1.8 /opt/mlmmjadmin +wget https://github.com/iredmail/mlmmjadmin/archive/1.9.tar.gz +tar zxf 1.9.tar.gz -C /opt +rm -f 1.9.tar.gz +ln -s /opt/mlmmjadmin-1.9 /opt/mlmmjadmin ``` * Generate config file by copying sample file, `settings.py.sample`: diff --git a/en_US/integrations/0-integration.mlmmj.pgsql.md b/en_US/integrations/0-integration.mlmmj.pgsql.md index 2043a169..33a57bc8 100644 --- a/en_US/integrations/0-integration.mlmmj.pgsql.md +++ b/en_US/integrations/0-integration.mlmmj.pgsql.md @@ -171,7 +171,7 @@ query = SELECT maillists.transport FROM maillists,domain WHERE maillists.a ``` * Run commands below to create file `/usr/bin/mlmmj-amime-receive` (Linux) or - `/usr/local/bin/mlmmj-amime-receive` (Linux/FreeBSD): + `/usr/local/bin/mlmmj-amime-receive` (FreeBSD/OpenBSD): !!! attention @@ -249,14 +249,14 @@ We will setup `mlmmjadmin` program to make managing mailing lists easier. !!! attention - We use version `1.8` for example below. + We use version `1.9` for example below. ``` cd /root/ -wget https://github.com/iredmail/mlmmjadmin/archive/1.8.tar.gz -tar zxf 1.8.tar.gz -C /opt -rm -f 1.8.tar.gz -ln -s /opt/mlmmjadmin-1.8 /opt/mlmmjadmin +wget https://github.com/iredmail/mlmmjadmin/archive/1.9.tar.gz +tar zxf 1.9.tar.gz -C /opt +rm -f 1.9.tar.gz +ln -s /opt/mlmmjadmin-1.9 /opt/mlmmjadmin ``` * Generate config file by copying sample file, `settings.py.sample`: diff --git a/en_US/upgrade/0-upgrade.iredmail.0.9.8-0.9.9.md b/en_US/upgrade/0-upgrade.iredmail.0.9.8-0.9.9.md index b274ab9d..74b5d902 100644 --- a/en_US/upgrade/0-upgrade.iredmail.0.9.8-0.9.9.md +++ b/en_US/upgrade/0-upgrade.iredmail.0.9.8-0.9.9.md @@ -8,13 +8,11 @@ check [the details](https://www.iredmail.org/support.html) and [contact us](https://www.iredmail.org/contact.html). -## TODO - -* Fix `mlmmj-amime-receive` and upgrade mlmmjadmin. - ## ChangeLog -## General (All backends should apply these steps) +* Nov 2, 2018, initial release. + +## General (All backends should apply these changes) ### Update `/etc/iredmail-release` with new iRedMail version number @@ -60,15 +58,6 @@ latest stable release immediately: * [How to upgrade Roundcube](https://github.com/roundcube/roundcubemail/wiki/Upgrade). -### Fix incorrect file owner/group of mlmmjadmin config file - -Please run commands below to fix incorrect file owner/group and permission: - -``` -chown mlmmj:mlmmj /opt/mlmmjadmin/settings.py -chmod 0400 /opt/mlmmjadmin/settings.py -``` - ### Fix improper Nginx config files for Roundcube Accurate Nginx url match helps avoid namespace conflicts, we need some fixes @@ -114,6 +103,40 @@ location ~ ^/plugins/.*/config.inc.php.* { deny all; } location ~ ^/plugins/enigma/home($|/.*) { deny all; } ``` +### Improve mlmmj script used for appending footer text + +Run commands below to create file `/usr/bin/mlmmj-amime-receive` (Linux) or +`/usr/local/bin/mlmmj-amime-receive` (FreeBSD/OpenBSD): + +On Linux: + +``` +cd /usr/bin/ +rm -f mlmmj-amime-receive +wget https://bitbucket.org/zhb/iredmail/raw/default/iRedMail/samples/mlmmj/mlmmj-amime-receive +chown mlmmj:mlmmj mlmmj-amime-receive +chmod 0550 mlmmj-amime-receive +``` + +On FreeBSD or OpenBSD: + +``` +cd /usr/local/bin/ +rm -f mlmmj-amime-receive +wget https://bitbucket.org/zhb/iredmail/raw/default/iRedMail/samples/mlmmj/mlmmj-amime-receive +chown mlmmj:mlmmj mlmmj-amime-receive +chmod 0550 mlmmj-amime-receive +``` + +### Fix incorrect file owner/group of mlmmjadmin config file + +Please run commands below to fix incorrect file owner/group and permission: + +``` +chown mlmmj:mlmmj /opt/mlmmjadmin/settings.py +chmod 0400 /opt/mlmmjadmin/settings.py +``` + ### Fix address mapping issue for mlmmj mailing list With default settings of iRedMail-0.9.8, if you use a per-user alias address diff --git a/html/integration.mlmmj.ldap.html b/html/integration.mlmmj.ldap.html index f94daf38..46c45975 100644 --- a/html/integration.mlmmj.ldap.html +++ b/html/integration.mlmmj.ldap.html @@ -173,7 +173,7 @@ scope = sub

Attention

@@ -245,15 +245,15 @@ fully integrated.

extract downloaded package to /opt/ directory, and create a symbol link:

Attention

-

We use version 1.8 for example below.

+

We use version 1.9 for example below.

cd /root/
-wget https://github.com/iredmail/mlmmjadmin/archive/1.8.tar.gz
-tar zxf 1.8.tar.gz -C /opt
-rm -f 1.8.tar.gz
-ln -s /opt/mlmmjadmin-1.8 /opt/mlmmjadmin
+wget https://github.com/iredmail/mlmmjadmin/archive/1.9.tar.gz
+tar zxf 1.9.tar.gz -C /opt
+rm -f 1.9.tar.gz
+ln -s /opt/mlmmjadmin-1.9 /opt/mlmmjadmin
 
cd /root/
-wget https://github.com/iredmail/mlmmjadmin/archive/1.8.tar.gz
-tar zxf 1.8.tar.gz -C /opt
-rm -f 1.8.tar.gz
-ln -s /opt/mlmmjadmin-1.8 /opt/mlmmjadmin
+wget https://github.com/iredmail/mlmmjadmin/archive/1.9.tar.gz
+tar zxf 1.9.tar.gz -C /opt
+rm -f 1.9.tar.gz
+ln -s /opt/mlmmjadmin-1.9 /opt/mlmmjadmin
 
cd /root/
-wget https://github.com/iredmail/mlmmjadmin/archive/1.8.tar.gz
-tar zxf 1.8.tar.gz -C /opt
-rm -f 1.8.tar.gz
-ln -s /opt/mlmmjadmin-1.8 /opt/mlmmjadmin
+wget https://github.com/iredmail/mlmmjadmin/archive/1.9.tar.gz
+tar zxf 1.9.tar.gz -C /opt
+rm -f 1.9.tar.gz
+ln -s /opt/mlmmjadmin-1.9 /opt/mlmmjadmin