Fix some typo and unclear sentences in upgrade tutorial.

This commit is contained in:
Zhang Huangbin 2016-05-04 11:08:55 +08:00
parent 2427104c10
commit 9f64a63cb1
4 changed files with 48 additions and 46 deletions

View File

@ -2,7 +2,10 @@
[TOC] [TOC]
> We provide remote upgrade service, check [the price](../support.html) and [contact us](../contact.html). !!! note "Paid Remote Upgrade Support"
We offer remote upgrade support if you don't want to get your hands dirty,
check [the details](../support.html) and [contact us](../contact.html).
This tutorial describes how to update or migrate iRedAdmin (either open source This tutorial describes how to update or migrate iRedAdmin (either open source
edition or old iRedAdmin-Pro release) to the latest iRedAdmin release (again, edition or old iRedAdmin-Pro release) to the latest iRedAdmin release (again,
@ -14,13 +17,13 @@ either open source edition or iRedAdmin-Pro).
so you __MUST__ upgrade iRedMail to the latest stable release before so you __MUST__ upgrade iRedMail to the latest stable release before
upgrading iRedAdmin-Pro. upgrading iRedAdmin-Pro.
> If you run the latest iRedAdmin-Pro with old iRedMail release, you may * If you run the latest iRedAdmin-Pro with old iRedMail release, you may
> get error due to missing some required ldap attribute/value pairs get error due to missing some required ldap attribute/value pairs
> (OpenLDAP backend), or missing some required SQL columns. (OpenLDAP backend), or missing some required SQL columns.
>
> If you run the latest iRedMail with old iRedAdmin-Pro, you may get error * If you run the latest iRedMail with old iRedAdmin-Pro, you may get error
> due to missing dropped SQL columns, or created accounts may miss some due to missing dropped SQL columns, or created accounts may miss some
> properties required by the latest iRedMail. properties required by the latest iRedMail.
1. You __MUST__ have iRedAdmin open source edition or old iRedAdmin-Pro release 1. You __MUST__ have iRedAdmin open source edition or old iRedAdmin-Pro release
installed and running on your server before upgrading. installed and running on your server before upgrading.
@ -30,7 +33,6 @@ either open source edition or iRedAdmin-Pro).
* iRedAdmin open source edition is available for download [here](http://www.iredmail.org/yum/misc/). * iRedAdmin open source edition is available for download [here](http://www.iredmail.org/yum/misc/).
* iRedAdmin-Pro customers can get download link of new release by following * iRedAdmin-Pro customers can get download link of new release by following
steps below: steps below:
* Login to iRedAdmin-Pro as global admin. * Login to iRedAdmin-Pro as global admin.
* Click `License` button on the top-right corner. it will show you basic * Click `License` button on the top-right corner. it will show you basic
license info and a `Download` button if new version is available. license info and a `Download` button if new version is available.
@ -45,11 +47,8 @@ either open source edition or iRedAdmin-Pro).
* Upload or copy the latest iRedAdmin to your server which has iRedAdmin * Upload or copy the latest iRedAdmin to your server which has iRedAdmin
open source edition or old iRedAdmin-Pro release running. We assume you open source edition or old iRedAdmin-Pro release running. We assume you
uploaded it to `/root/iRedAdmin-{BACKEND}-x.y.z.tar.bz2` (`{BACKEND}` is one uploaded it to `/root/iRedAdmin-x.y.z.tar.bz2` (`x.y.z` is a placeholder of
of `LDAP`, `MySQL`, `PGSQL`). We will use iRedAdmin-x.y.z below for the version number).
example, please replace x.y.z by the real file name. For example,
`iRedAdmin-Pro-LDAP-2.4.0.tar.bz2`.
* Uncompress and upgrade iRedAdmin: * Uncompress and upgrade iRedAdmin:
``` ```

View File

@ -38,6 +38,11 @@ latest stable release:
### [Linux] Fixed: not add ssh port number in Fail2ban config file (jail.local) ### [Linux] Fixed: not add ssh port number in Fail2ban config file (jail.local)
!!! attention
If your `jail.local` uses `action = iptables-allports`, then you can skip
this step.
iRedMail-0.9.4 doesn't list ssh port number in 2 Fail2ban jails: `sshd`, iRedMail-0.9.4 doesn't list ssh port number in 2 Fail2ban jails: `sshd`,
`sshd-ddos`, this causes Fail2ban doesn't block bad client IP address for `sshd-ddos`, this causes Fail2ban doesn't block bad client IP address for
ssh service. ssh service.
@ -169,7 +174,8 @@ location ^~ /SOGo/Microsoft-Server-ActiveSync {
The timeout value, `360` (seconds), used below must be same as the value of The timeout value, `360` (seconds), used below must be same as the value of
parameter `SOGoMaximumPingInterval =` in SOGo config file `/etc/sogo/sogo.conf` parameter `SOGoMaximumPingInterval =` in SOGo config file `/etc/sogo/sogo.conf`
(Linux/OpenBSD) or `/usr/local/etc/sogo/sogo.conf`. (Linux/OpenBSD) or `/usr/local/etc/sogo/sogo.conf`. if your `sogo.conf`
doesn't have this setting, please add it manually (`SOGoMaximumPingInterval = 360;`).
``` ```
location ^~ /Microsoft-Server-ActiveSync { location ^~ /Microsoft-Server-ActiveSync {
@ -640,11 +646,6 @@ Groupware (webmail, calendar, contacts, ActiveSync).
To accomplish this, we need to add a new SQL column `enablesogo` in SQL table To accomplish this, we need to add a new SQL column `enablesogo` in SQL table
`vmail.mailbox`, then re-create SQL VIEW `sogo.users`. `vmail.mailbox`, then re-create SQL VIEW `sogo.users`.
Before we go further, please find the SQL password for SQL user `vmail`
in Postfix config file `/etc/postfix/mysql/*.cf` (on Linux/OpenBSD) or
`/usr/local/etc/postfix/mysql/*.cf` (on FreeBSD), we need this while
(re-)creating SQL VIEW `sogo.users`.
Please login to MySQL/MariaDB as SQL root user first: Please login to MySQL/MariaDB as SQL root user first:
``` ```
@ -660,7 +661,7 @@ sql> ALTER TABLE mailbox ADD COLUMN enablesogo TINYINT(1) NOT NULL DEFAULT 1;
sql> ALTER TABLE mailbox ADD INDEX (enablesogo); sql> ALTER TABLE mailbox ADD INDEX (enablesogo);
sql> USE sogo; sql> USE sogo;
sql> DROP TABLE users; sql> DROP VIEW users;
sql> CREATE VIEW sogo.users (c_uid, c_name, c_password, c_cn, mail, domain) AS SELECT username, username, password, name, username, domain FROM vmail.mailbox WHERE enablesogo=1 AND active=1; sql> CREATE VIEW sogo.users (c_uid, c_name, c_password, c_cn, mail, domain) AS SELECT username, username, password, name, username, domain FROM vmail.mailbox WHERE enablesogo=1 AND active=1;
``` ```

View File

@ -26,9 +26,11 @@
</li> </li>
</ul> </ul>
</div> </div>
<blockquote> <div class="admonition note">
<p>We provide remote upgrade service, check <a href="../support.html">the price</a> and <a href="../contact.html">contact us</a>.</p> <p class="admonition-title">Paid Remote Upgrade Support</p>
</blockquote> <p>We offer remote upgrade support if you don't want to get your hands dirty,
check <a href="../support.html">the details</a> and <a href="../contact.html">contact us</a>.</p>
</div>
<p>This tutorial describes how to update or migrate iRedAdmin (either open source <p>This tutorial describes how to update or migrate iRedAdmin (either open source
edition or old iRedAdmin-Pro release) to the latest iRedAdmin release (again, edition or old iRedAdmin-Pro release) to the latest iRedAdmin release (again,
either open source edition or iRedAdmin-Pro).</p> either open source edition or iRedAdmin-Pro).</p>
@ -38,14 +40,18 @@ either open source edition or iRedAdmin-Pro).</p>
<p>The latest iRedAdmin-Pro always requires the latest iRedMail stable release, <p>The latest iRedAdmin-Pro always requires the latest iRedMail stable release,
so you <strong>MUST</strong> upgrade iRedMail to the latest stable release before so you <strong>MUST</strong> upgrade iRedMail to the latest stable release before
upgrading iRedAdmin-Pro.</p> upgrading iRedAdmin-Pro.</p>
<blockquote> <ul>
<li>
<p>If you run the latest iRedAdmin-Pro with old iRedMail release, you may <p>If you run the latest iRedAdmin-Pro with old iRedMail release, you may
get error due to missing some required ldap attribute/value pairs get error due to missing some required ldap attribute/value pairs
(OpenLDAP backend), or missing some required SQL columns.</p> (OpenLDAP backend), or missing some required SQL columns.</p>
</li>
<li>
<p>If you run the latest iRedMail with old iRedAdmin-Pro, you may get error <p>If you run the latest iRedMail with old iRedAdmin-Pro, you may get error
due to missing dropped SQL columns, or created accounts may miss some due to missing dropped SQL columns, or created accounts may miss some
properties required by the latest iRedMail.</p> properties required by the latest iRedMail.</p>
</blockquote> </li>
</ul>
</li> </li>
<li> <li>
<p>You <strong>MUST</strong> have iRedAdmin open source edition or old iRedAdmin-Pro release <p>You <strong>MUST</strong> have iRedAdmin open source edition or old iRedAdmin-Pro release
@ -72,17 +78,11 @@ properties required by the latest iRedMail.</p>
</ul> </ul>
<h2 id="upgrade-steps">Upgrade Steps</h2> <h2 id="upgrade-steps">Upgrade Steps</h2>
<ul> <ul>
<li> <li>Upload or copy the latest iRedAdmin to your server which has iRedAdmin
<p>Upload or copy the latest iRedAdmin to your server which has iRedAdmin
open source edition or old iRedAdmin-Pro release running. We assume you open source edition or old iRedAdmin-Pro release running. We assume you
uploaded it to <code>/root/iRedAdmin-{BACKEND}-x.y.z.tar.bz2</code> (<code>{BACKEND}</code> is one uploaded it to <code>/root/iRedAdmin-x.y.z.tar.bz2</code> (<code>x.y.z</code> is a placeholder of
of <code>LDAP</code>, <code>MySQL</code>, <code>PGSQL</code>). We will use iRedAdmin-x.y.z below for the version number).</li>
example, please replace x.y.z by the real file name. For example, <li>Uncompress and upgrade iRedAdmin:</li>
<code>iRedAdmin-Pro-LDAP-2.4.0.tar.bz2</code>.</p>
</li>
<li>
<p>Uncompress and upgrade iRedAdmin:</p>
</li>
</ul> </ul>
<pre><code># cd /root/ <pre><code># cd /root/
# tar xjf iRedAdmin-x.y.z.tar.bz2 # tar xjf iRedAdmin-x.y.z.tar.bz2

View File

@ -100,6 +100,11 @@ so that you can know which version of iRedMail you're running. For example:</p>
latest stable release: latest stable release:
<a href="./migrate.or.upgrade.iredadmin.html">Upgrade iRedAdmin to the latest stable release</a></p> <a href="./migrate.or.upgrade.iredadmin.html">Upgrade iRedAdmin to the latest stable release</a></p>
<h3 id="linux-fixed-not-add-ssh-port-number-in-fail2ban-config-file-jaillocal">[Linux] Fixed: not add ssh port number in Fail2ban config file (jail.local)</h3> <h3 id="linux-fixed-not-add-ssh-port-number-in-fail2ban-config-file-jaillocal">[Linux] Fixed: not add ssh port number in Fail2ban config file (jail.local)</h3>
<div class="admonition attention">
<p class="admonition-title">Attention</p>
<p>If your <code>jail.local</code> uses <code>action = iptables-allports</code>, then you can skip
this step.</p>
</div>
<p>iRedMail-0.9.4 doesn't list ssh port number in 2 Fail2ban jails: <code>sshd</code>, <p>iRedMail-0.9.4 doesn't list ssh port number in 2 Fail2ban jails: <code>sshd</code>,
<code>sshd-ddos</code>, this causes Fail2ban doesn't block bad client IP address for <code>sshd-ddos</code>, this causes Fail2ban doesn't block bad client IP address for
ssh service.</p> ssh service.</p>
@ -225,7 +230,8 @@ location ^~ /SOGo/Microsoft-Server-ActiveSync {
<p class="admonition-title">Warning</p> <p class="admonition-title">Warning</p>
<p>The timeout value, <code>360</code> (seconds), used below must be same as the value of <p>The timeout value, <code>360</code> (seconds), used below must be same as the value of
parameter <code>SOGoMaximumPingInterval =</code> in SOGo config file <code>/etc/sogo/sogo.conf</code> parameter <code>SOGoMaximumPingInterval =</code> in SOGo config file <code>/etc/sogo/sogo.conf</code>
(Linux/OpenBSD) or <code>/usr/local/etc/sogo/sogo.conf</code>.</p> (Linux/OpenBSD) or <code>/usr/local/etc/sogo/sogo.conf</code>. if your <code>sogo.conf</code>
doesn't have this setting, please add it manually (<code>SOGoMaximumPingInterval = 360;</code>).</p>
</div> </div>
<pre><code>location ^~ /Microsoft-Server-ActiveSync { <pre><code>location ^~ /Microsoft-Server-ActiveSync {
... ...
@ -655,10 +661,6 @@ postconf -e sender_dependent_relayhost_maps='proxy:mysql:/usr/local/etc/postfix/
Groupware (webmail, calendar, contacts, ActiveSync).</p> Groupware (webmail, calendar, contacts, ActiveSync).</p>
<p>To accomplish this, we need to add a new SQL column <code>enablesogo</code> in SQL table <p>To accomplish this, we need to add a new SQL column <code>enablesogo</code> in SQL table
<code>vmail.mailbox</code>, then re-create SQL VIEW <code>sogo.users</code>.</p> <code>vmail.mailbox</code>, then re-create SQL VIEW <code>sogo.users</code>.</p>
<p>Before we go further, please find the SQL password for SQL user <code>vmail</code>
in Postfix config file <code>/etc/postfix/mysql/*.cf</code> (on Linux/OpenBSD) or
<code>/usr/local/etc/postfix/mysql/*.cf</code> (on FreeBSD), we need this while
(re-)creating SQL VIEW <code>sogo.users</code>.</p>
<p>Please login to MySQL/MariaDB as SQL root user first:</p> <p>Please login to MySQL/MariaDB as SQL root user first:</p>
<pre><code># mysql -uroot -p <pre><code># mysql -uroot -p
</code></pre> </code></pre>
@ -670,7 +672,7 @@ sql&gt; ALTER TABLE mailbox ADD COLUMN enablesogo TINYINT(1) NOT NULL DEFAULT 1;
sql&gt; ALTER TABLE mailbox ADD INDEX (enablesogo); sql&gt; ALTER TABLE mailbox ADD INDEX (enablesogo);
sql&gt; USE sogo; sql&gt; USE sogo;
sql&gt; DROP TABLE users; sql&gt; DROP VIEW users;
sql&gt; CREATE VIEW sogo.users (c_uid, c_name, c_password, c_cn, mail, domain) AS SELECT username, username, password, name, username, domain FROM vmail.mailbox WHERE enablesogo=1 AND active=1; sql&gt; CREATE VIEW sogo.users (c_uid, c_name, c_password, c_cn, mail, domain) AS SELECT username, username, password, name, username, domain FROM vmail.mailbox WHERE enablesogo=1 AND active=1;
</code></pre> </code></pre>