Fix typo in README.md.

Code cleanup in upgrade tutorial.
This commit is contained in:
Zhang Huangbin 2016-05-05 22:54:51 +08:00
parent 8088f0166b
commit 76cd29005d
6 changed files with 38 additions and 34 deletions

View File

@ -4,12 +4,16 @@ to read converted documents in HTML format, get support in our forum:
# How to translate and contribute # How to translate and contribute
* Create a new directory and name it to the short language code. e.g. for * Create a new directory and name it to the short language code. for example:
Germany, please name it `zh_CN`. * `de_DE` for `German`
* Add file `zh_CN/_lang.md` with the full name of the language. e.g. * `zh_CN` for `Chinese`
write `English` in `en_US/_lang.md`, `简体中文` in `zh_CN/_lang.md`. * Add file `[xx_XX]/_lang.md` with the full name of the language. for example:
* `English` in `en_US/_lang.md`
* `Deutsch` in `de_DE/_lang.md`
* `简体中文` in `zh_CN/_lang.md`.
* Copy the markdown document you want to translate to new language directory, * Copy the markdown document you want to translate to new language directory,
create the same sub-directories as original document. For example, to create the same sub-directory as original document. For example, to
translate `en_US/howto/reset.user.password.md`, please create translate `en_US/howto/reset.user.password.md` to Chinese, please create
`zh_CN/howto/` and copy `reset.user.password.md` to `zh_CN/howto/`. directory `zh_CN/howto/` and copy `reset.user.password.md` to `zh_CN/howto/`
(with same file name).
* Translate the file and send a pull request. * Translate the file and send a pull request.

View File

@ -121,7 +121,7 @@ Parameter Name | Summary | Sample Usage
`cn` | display name | `cn=My List Name` `cn` | display name | `cn=My List Name`
`accessPolicy` | Defines who can send email to this mail alias account | `accessPolicy=public` `accessPolicy` | Defines who can send email to this mail alias account | `accessPolicy=public`
> Note: `accessPolicy` for mail alias account is available for only SQL backends. > Note: `accessPolicy` for mail alias account is only available for SQL backends.
### Throttling ### Throttling

View File

@ -91,24 +91,24 @@ If it prints all users stored in AD server, then it's working as expected.
Disable unused iRedMail special settings: Disable unused iRedMail special settings:
```shell ```shell
# postconf -e virtual_alias_maps='' postconf -e virtual_alias_maps=''
# postconf -e sender_bcc_maps='' postconf -e sender_bcc_maps=''
# postconf -e recipient_bcc_maps='' postconf -e recipient_bcc_maps=''
# postconf -e relay_domains='' postconf -e relay_domains=''
# postconf -e relay_recipient_maps='' postconf -e relay_recipient_maps=''
``` ```
Add your mail domain name in `smtpd_sasl_local_domain` and `virtual_mailbox_domains`: Add your mail domain name in `smtpd_sasl_local_domain` and `virtual_mailbox_domains`:
```shell ```shell
# postconf -e smtpd_sasl_local_domain='example.com' postconf -e smtpd_sasl_local_domain='example.com'
# postconf -e virtual_mailbox_domains='example.com' postconf -e virtual_mailbox_domains='example.com'
``` ```
Change transport maps setting: Change transport maps setting:
``` ```
# postconf -e transport_maps='hash:/etc/postfix/transport' postconf -e transport_maps='hash:/etc/postfix/transport'
``` ```
Enable AD query. __Note__: We will create these 3 files later. Enable AD query. __Note__: We will create these 3 files later.
@ -116,19 +116,19 @@ Enable AD query. __Note__: We will create these 3 files later.
* Verify SMTP senders * Verify SMTP senders
```shell ```shell
# postconf -e smtpd_sender_login_maps='proxy:ldap:/etc/postfix/ad_sender_login_maps.cf' postconf -e smtpd_sender_login_maps='proxy:ldap:/etc/postfix/ad_sender_login_maps.cf'
``` ```
* Verify local mail users * Verify local mail users
```shell ```shell
# postconf -e virtual_mailbox_maps='proxy:ldap:/etc/postfix/ad_virtual_mailbox_maps.cf' postconf -e virtual_mailbox_maps='proxy:ldap:/etc/postfix/ad_virtual_mailbox_maps.cf'
``` ```
* Verify local mail lists/groups. * Verify local mail lists/groups.
``` ```
# postconf -e virtual_alias_maps='proxy:ldap:/etc/postfix/ad_virtual_group_maps.cf' postconf -e virtual_alias_maps='proxy:ldap:/etc/postfix/ad_virtual_group_maps.cf'
``` ```
* Create/edit file: `/etc/postfix/transport`. * Create/edit file: `/etc/postfix/transport`.

View File

@ -15,7 +15,7 @@ below.
* Backup config files first: * Backup config files first:
``` ```
mkdir /root/sogo-backup/{sogo,sysconfig} mkdir -p /root/sogo-backup/{sogo,sysconfig}
cp /etc/sogo/* /root/sogo-backup/sogo/ cp /etc/sogo/* /root/sogo-backup/sogo/
cp /etc/sysconfig/sogo /root/sogo-backup/sysconfig/ cp /etc/sysconfig/sogo /root/sogo-backup/sysconfig/
``` ```
@ -51,7 +51,7 @@ service sogod restart
* Backup config files first: * Backup config files first:
``` ```
mkdir /root/sogo-backup/{sogo,default} mkdir -p /root/sogo-backup/{sogo,default}
cp /etc/sogo/* /root/sogo-backup/sogo/ cp /etc/sogo/* /root/sogo-backup/sogo/
cp /etc/default/sogo /root/sogo-backup/default/ cp /etc/default/sogo /root/sogo-backup/default/
``` ```

View File

@ -120,39 +120,39 @@ Enter password: password_of_vmail
<p>If it prints all users stored in AD server, then it's working as expected.</p> <p>If it prints all users stored in AD server, then it's working as expected.</p>
<h3 id="enable-ldap-query-with-ad-in-postfix">Enable LDAP query with AD in Postfix</h3> <h3 id="enable-ldap-query-with-ad-in-postfix">Enable LDAP query with AD in Postfix</h3>
<p>Disable unused iRedMail special settings:</p> <p>Disable unused iRedMail special settings:</p>
<pre><code class="shell"># postconf -e virtual_alias_maps='' <pre><code class="shell">postconf -e virtual_alias_maps=''
# postconf -e sender_bcc_maps='' postconf -e sender_bcc_maps=''
# postconf -e recipient_bcc_maps='' postconf -e recipient_bcc_maps=''
# postconf -e relay_domains='' postconf -e relay_domains=''
# postconf -e relay_recipient_maps='' postconf -e relay_recipient_maps=''
</code></pre> </code></pre>
<p>Add your mail domain name in <code>smtpd_sasl_local_domain</code> and <code>virtual_mailbox_domains</code>:</p> <p>Add your mail domain name in <code>smtpd_sasl_local_domain</code> and <code>virtual_mailbox_domains</code>:</p>
<pre><code class="shell"># postconf -e smtpd_sasl_local_domain='example.com' <pre><code class="shell">postconf -e smtpd_sasl_local_domain='example.com'
# postconf -e virtual_mailbox_domains='example.com' postconf -e virtual_mailbox_domains='example.com'
</code></pre> </code></pre>
<p>Change transport maps setting:</p> <p>Change transport maps setting:</p>
<pre><code># postconf -e transport_maps='hash:/etc/postfix/transport' <pre><code>postconf -e transport_maps='hash:/etc/postfix/transport'
</code></pre> </code></pre>
<p>Enable AD query. <strong>Note</strong>: We will create these 3 files later.</p> <p>Enable AD query. <strong>Note</strong>: We will create these 3 files later.</p>
<ul> <ul>
<li>Verify SMTP senders</li> <li>Verify SMTP senders</li>
</ul> </ul>
<pre><code class="shell"># postconf -e smtpd_sender_login_maps='proxy:ldap:/etc/postfix/ad_sender_login_maps.cf' <pre><code class="shell">postconf -e smtpd_sender_login_maps='proxy:ldap:/etc/postfix/ad_sender_login_maps.cf'
</code></pre> </code></pre>
<ul> <ul>
<li>Verify local mail users</li> <li>Verify local mail users</li>
</ul> </ul>
<pre><code class="shell"># postconf -e virtual_mailbox_maps='proxy:ldap:/etc/postfix/ad_virtual_mailbox_maps.cf' <pre><code class="shell">postconf -e virtual_mailbox_maps='proxy:ldap:/etc/postfix/ad_virtual_mailbox_maps.cf'
</code></pre> </code></pre>
<ul> <ul>
<li>Verify local mail lists/groups.</li> <li>Verify local mail lists/groups.</li>
</ul> </ul>
<pre><code># postconf -e virtual_alias_maps='proxy:ldap:/etc/postfix/ad_virtual_group_maps.cf' <pre><code>postconf -e virtual_alias_maps='proxy:ldap:/etc/postfix/ad_virtual_group_maps.cf'
</code></pre> </code></pre>
<ul> <ul>

View File

@ -34,7 +34,7 @@ below.</p>
<ul> <ul>
<li>Backup config files first:</li> <li>Backup config files first:</li>
</ul> </ul>
<pre><code>mkdir /root/sogo-backup/{sogo,sysconfig} <pre><code>mkdir -p /root/sogo-backup/{sogo,sysconfig}
cp /etc/sogo/* /root/sogo-backup/sogo/ cp /etc/sogo/* /root/sogo-backup/sogo/
cp /etc/sysconfig/sogo /root/sogo-backup/sysconfig/ cp /etc/sysconfig/sogo /root/sogo-backup/sysconfig/
</code></pre> </code></pre>
@ -69,7 +69,7 @@ cp /root/sogo-backup/sysconfig/sogo /etc/sysconfig/
<ul> <ul>
<li>Backup config files first:</li> <li>Backup config files first:</li>
</ul> </ul>
<pre><code>mkdir /root/sogo-backup/{sogo,default} <pre><code>mkdir -p /root/sogo-backup/{sogo,default}
cp /etc/sogo/* /root/sogo-backup/sogo/ cp /etc/sogo/* /root/sogo-backup/sogo/
cp /etc/default/sogo /root/sogo-backup/default/ cp /etc/default/sogo /root/sogo-backup/default/
</code></pre> </code></pre>