diff --git a/convert.sh b/convert.sh index efeec9dc..c956a24c 100755 --- a/convert.sh +++ b/convert.sh @@ -59,9 +59,11 @@ for lang in ${all_languages}; do # Directory used to store converted html files. OUTPUT_DIR="${ROOTDIR}/html" CSS_FILE='./css/markdown.css' + IS_SUB_FOLDER='NO' if [ X"${lang}" != X'en_US' ]; then OUTPUT_DIR="${ROOTDIR}/html/${lang}" CSS_FILE='../css/markdown.css' + IS_SUB_FOLDER='YES' fi # Markdown file used to store index of chapters/articles. @@ -158,7 +160,8 @@ for lang in ${all_languages}; do output_filename="${article_html_file}" \ title="${_article_title}" \ add_index_link='yes' \ - css="${CSS_FILE}" + css="${CSS_FILE}" \ + is_sub_folder="${IS_SUB_FOLDER}" if [ X"$?" == X'0' ]; then echo -e ' [DONE]' @@ -192,7 +195,10 @@ for lang in ${all_languages}; do echo "* ${article_counter} files total for ${lang}." echo "* Converting ${INDEX_MD} for index page." - ${CMD_CONVERT} ${INDEX_MD} ${OUTPUT_DIR} title="iRedMail Documentations" css="${CSS_FILE}" + ${CMD_CONVERT} ${INDEX_MD} ${OUTPUT_DIR} \ + title="iRedMail Documentations" \ + css="${CSS_FILE}" \ + is_sub_folder="${IS_SUB_FOLDER}" # Cleanup and reset variables rm -f ${INDEX_MD} diff --git a/en_US/faq/0-iredadmin-pro.restful.api.python.md b/en_US/faq/0-iredadmin-pro.restful.api.python.md index 549196ea..294a22c4 100644 --- a/en_US/faq/0-iredadmin-pro.restful.api.python.md +++ b/en_US/faq/0-iredadmin-pro.restful.api.python.md @@ -26,11 +26,9 @@ pw = 'my_password' r = requests.post(url + '/login', data={'username': admin, 'password': pw}) -# Get returned JSON data and get auth_token. +# Get returned JSON data data = r.json() -if data['success']: - auth_token = r.text['auth_token'] -else: +if not data['success']: sys.exit('Login failed') cookies = r.cookies diff --git a/en_US/installation/0-install.iredmail.on.debian.ubuntu.md b/en_US/installation/0-install.iredmail.on.debian.ubuntu.md index 3f802b9b..e9f5e707 100644 --- a/en_US/installation/0-install.iredmail.on.debian.ubuntu.md +++ b/en_US/installation/0-install.iredmail.on.debian.ubuntu.md @@ -135,16 +135,10 @@ with iRedAdmin, our web-based iRedMail admin panel. ![](../images/installation/iredmail/backend.png) * If you choose to store mail accounts in OpenLDAP, iRedMail installer will -ask you two questions about OpenLDAP. - -LDAP suffix. + ask to set the LDAP suffix. ![](../images/installation/iredmail/ldap_suffix.png) -Password of LDAP root dn. - -![](../images/installation/iredmail/pw_of_ldap_root_dn.png) - !!! note "To MySQL/MariaDB/PostgreSQL users" If you choose to store mail accounts in MySQL/MariaDB/PostgreSQL, iRedMail @@ -208,7 +202,7 @@ Configuration completed. message in web browser or mail clients when accessing mailbox via HTTPS/IMAPS/POP3/SMTPS. [Let's Encrypt offers __FREE__ SSL certificate](https://letsencrypt.org). We have a document for you to - [use a SSL certificate](http://www.iredmail.org/docs/use.a.bought.ssl.certificate.html). + [use a SSL certificate](./use.a.bought.ssl.certificate.html). * If you need to bulk create mail users, check our document for [OpenLDAP](./ldap.bulk.create.mail.users.html) and [MySQL/MariaDB/PostgreSQL](./sql.bulk.create.mail.users.html). diff --git a/en_US/installation/0-install.iredmail.on.freebsd.md b/en_US/installation/0-install.iredmail.on.freebsd.md index acd6b223..0fdd2a88 100644 --- a/en_US/installation/0-install.iredmail.on.freebsd.md +++ b/en_US/installation/0-install.iredmail.on.freebsd.md @@ -136,16 +136,10 @@ with iRedAdmin, our web-based iRedMail admin panel. ![](../images/installation/iredmail/backend.png) * If you choose to store mail accounts in OpenLDAP, iRedMail installer will -ask you two questions about OpenLDAP. - -LDAP suffix. + ask to set the LDAP suffix. ![](../images/installation/iredmail/ldap_suffix.png) -Password of LDAP root dn. - -![](../images/installation/iredmail/pw_of_ldap_root_dn.png) - !!! note "To MySQL/MariaDB/PostgreSQL users" If you choose to store mail accounts in MySQL/MariaDB/PostgreSQL, iRedMail @@ -209,7 +203,7 @@ Configuration completed. message in web browser or mail clients when accessing mailbox via HTTPS/IMAPS/POP3/SMTPS. [Let's Encrypt offers __FREE__ SSL certificate](https://letsencrypt.org). We have a document for you to - [use a SSL certificate](http://www.iredmail.org/docs/use.a.bought.ssl.certificate.html). + [use a SSL certificate](./use.a.bought.ssl.certificate.html). * If you need to bulk create mail users, check our document for [OpenLDAP](./ldap.bulk.create.mail.users.html) and [MySQL/MariaDB/PostgreSQL](./sql.bulk.create.mail.users.html). diff --git a/en_US/installation/0-install.iredmail.on.freebsd.with.jail.md b/en_US/installation/0-install.iredmail.on.freebsd.with.jail.md index d2fff5d6..85e098ab 100644 --- a/en_US/installation/0-install.iredmail.on.freebsd.with.jail.md +++ b/en_US/installation/0-install.iredmail.on.freebsd.with.jail.md @@ -152,16 +152,10 @@ with iRedAdmin, our web-based iRedMail admin panel. ![](../images/installation/iredmail/backend.png) * If you choose to store mail accounts in OpenLDAP, iRedMail installer will -ask you two questions about OpenLDAP. - -LDAP suffix. + ask to set the LDAP suffix. ![](../images/installation/iredmail/ldap_suffix.png) -Password of LDAP root dn. - -![](../images/installation/iredmail/pw_of_ldap_root_dn.png) - !!! note "To MySQL/MariaDB/PostgreSQL users" If you choose to store mail accounts in MySQL/MariaDB/PostgreSQL, iRedMail @@ -225,7 +219,7 @@ Configuration completed. message in web browser or mail clients when accessing mailbox via HTTPS/IMAPS/POP3/SMTPS. [Let's Encrypt offers __FREE__ SSL certificate](https://letsencrypt.org). We have a document for you to - [use a SSL certificate](http://www.iredmail.org/docs/use.a.bought.ssl.certificate.html). + [use a SSL certificate](./use.a.bought.ssl.certificate.html). * If you need to bulk create mail users, check our document for [OpenLDAP](./ldap.bulk.create.mail.users.html) and [MySQL/MariaDB/PostgreSQL](./sql.bulk.create.mail.users.html). diff --git a/en_US/installation/0-install.iredmail.on.openbsd.md b/en_US/installation/0-install.iredmail.on.openbsd.md index 0f966f40..5fafc51a 100644 --- a/en_US/installation/0-install.iredmail.on.openbsd.md +++ b/en_US/installation/0-install.iredmail.on.openbsd.md @@ -159,16 +159,10 @@ with iRedAdmin, our web-based iRedMail admin panel. ![](../images/installation/iredmail/backend.png) * If you choose to store mail accounts in OpenLDAP, iRedMail installer will -ask you two questions about OpenLDAP. - -LDAP suffix. + ask to set the LDAP suffix. ![](../images/installation/iredmail/ldap_suffix.png) -Password of LDAP root dn. - -![](../images/installation/iredmail/pw_of_ldap_root_dn.png) - !!! note "To MySQL/MariaDB/PostgreSQL users" If you choose to store mail accounts in MySQL/MariaDB/PostgreSQL, iRedMail @@ -232,7 +226,7 @@ Configuration completed. message in web browser or mail clients when accessing mailbox via HTTPS/IMAPS/POP3/SMTPS. [Let's Encrypt offers __FREE__ SSL certificate](https://letsencrypt.org). We have a document for you to - [use a SSL certificate](http://www.iredmail.org/docs/use.a.bought.ssl.certificate.html). + [use a SSL certificate](./use.a.bought.ssl.certificate.html). * If you need to bulk create mail users, check our document for [OpenLDAP](./ldap.bulk.create.mail.users.html) and [MySQL/MariaDB/PostgreSQL](./sql.bulk.create.mail.users.html). diff --git a/en_US/installation/0-install.iredmail.on.rhel.md b/en_US/installation/0-install.iredmail.on.rhel.md index 2ed6b420..7974abb8 100644 --- a/en_US/installation/0-install.iredmail.on.rhel.md +++ b/en_US/installation/0-install.iredmail.on.rhel.md @@ -5,6 +5,7 @@ > This tutorial is available in other languages: > > * [Russian](http://www.everycloudtech.com/install.iredmail.on.rhel). Thanks to [Everycloudtech](http://www.everycloudtech.com/). +> * [简体中文](./zh_CN/install.iredmail.on.rhel.html) ## System Requirements @@ -167,16 +168,10 @@ with iRedAdmin, our web-based iRedMail admin panel. ![](../images/installation/iredmail/backend.png) * If you choose to store mail accounts in OpenLDAP, iRedMail installer will -ask you two questions about OpenLDAP. - - * LDAP suffix. + ask to set the LDAP suffix. ![](../images/installation/iredmail/ldap_suffix.png) - * Password of LDAP root dn. - -![](../images/installation/iredmail/pw_of_ldap_root_dn.png) - !!! note "To MySQL/MariaDB/PostgreSQL users" If you choose to store mail accounts in MySQL/MariaDB/PostgreSQL, iRedMail @@ -240,7 +235,7 @@ Configuration completed. message in web browser or mail clients when accessing mailbox via HTTPS/IMAPS/POP3/SMTPS. [Let's Encrypt offers __FREE__ SSL certificate](https://letsencrypt.org). We have a document for you to - [use a SSL certificate](http://www.iredmail.org/docs/use.a.bought.ssl.certificate.html). + [use a SSL certificate](./use.a.bought.ssl.certificate.html). * If you need to bulk create mail users, check our document for [OpenLDAP](./ldap.bulk.create.mail.users.html) and [MySQL/MariaDB/PostgreSQL](./sql.bulk.create.mail.users.html). diff --git a/html/active.directory.html b/html/active.directory.html index eef715bd..6db4541c 100644 --- a/html/active.directory.html +++ b/html/active.directory.html @@ -7,7 +7,13 @@
Important Notes
diff --git a/html/activesync.bb10.html b/html/activesync.bb10.html index 7d31f16d..4a113334 100644 --- a/html/activesync.bb10.html +++ b/html/activesync.bb10.html @@ -7,7 +7,13 @@Important Notes
diff --git a/html/activesync.ios.html b/html/activesync.ios.html index 2b2c3c68..ad9d29a9 100644 --- a/html/activesync.ios.html +++ b/html/activesync.ios.html @@ -7,7 +7,13 @@Important Notes
diff --git a/html/activesync.outlook.html b/html/activesync.outlook.html index 12424e76..f84fbf5f 100644 --- a/html/activesync.outlook.html +++ b/html/activesync.outlook.html @@ -7,7 +7,13 @@Important Notes
diff --git a/html/additional.smtp.port.html b/html/additional.smtp.port.html index 253a5232..35ea4045 100644 --- a/html/additional.smtp.port.html +++ b/html/additional.smtp.port.html @@ -7,7 +7,13 @@iRedMail configures Postfix to reject the request when sender specifies an owner for the MAIL FROM address diff --git a/html/allow.insecure.pop3.imap.smtp.connections.html b/html/allow.insecure.pop3.imap.smtp.connections.html index a09a5453..35e5af6e 100644 --- a/html/allow.insecure.pop3.imap.smtp.connections.html +++ b/html/allow.insecure.pop3.imap.smtp.connections.html @@ -7,7 +7,13 @@
To allow member of mailing list (or mail alias) account to send email as this mailing list (or mail alias), please follw steps below:
diff --git a/html/allow.user.to.send.email.without.authentication.html b/html/allow.user.to.send.email.without.authentication.html index 894698f9..6e65833d 100644 --- a/html/allow.user.to.send.email.without.authentication.html +++ b/html/allow.user.to.send.email.without.authentication.html @@ -7,7 +7,13 @@Create a plain text file: /etc/postfix/accepted_unauth_senders
, list all
users' email addresses which are allowed to send email without smtp
diff --git a/html/amavisd.per-recipient.policy.lookup.html b/html/amavisd.per-recipient.policy.lookup.html
index c6724de1..de784f43 100644
--- a/html/amavisd.per-recipient.policy.lookup.html
+++ b/html/amavisd.per-recipient.policy.lookup.html
@@ -7,7 +7,13 @@
With per-recipient policy lookup, you can achieve per-recipient white/blacklists, basic spamassassin preferences, etc. Settings are available as global setting, diff --git a/html/amavisd.sql.db.html b/html/amavisd.sql.db.html index 247e12a4..db5aed31 100644 --- a/html/amavisd.sql.db.html +++ b/html/amavisd.sql.db.html @@ -7,7 +7,13 @@
With default settings, client must use full email address as username for POP3/IMAP/SMTP/webmail login, if you want to login without domain name part in diff --git a/html/backup.restore.html b/html/backup.restore.html index 9a892d54..ff7655c5 100644 --- a/html/backup.restore.html +++ b/html/backup.restore.html @@ -7,7 +7,13 @@
To change server hostname after iRedMail installation, please update below files to replace old hostname by the new one:
diff --git a/html/cluebringer.to.iredapd.html b/html/cluebringer.to.iredapd.html index 47497c17..d08971db 100644 --- a/html/cluebringer.to.iredapd.html +++ b/html/cluebringer.to.iredapd.html @@ -7,7 +7,13 @@WARNING: Processing more concurrent emails require more RAM.
Amavisd-new is content filter, it invokes SpamAssassin and ClamAV for diff --git a/html/configure.thunderbird.html b/html/configure.thunderbird.html index ba5eaf24..c26c6a7b 100644 --- a/html/configure.thunderbird.html +++ b/html/configure.thunderbird.html @@ -7,7 +7,13 @@
iRedAdmin offers several settings to customize the maildir path, default values
are stored in file libs/default_settings.py
, if you need to change them,
diff --git a/html/dbmail.mysql.centos.html b/html/dbmail.mysql.centos.html
index f09dd974..15cc79f8 100644
--- a/html/dbmail.mysql.centos.html
+++ b/html/dbmail.mysql.centos.html
@@ -7,7 +7,13 @@
In Amavisd config file, change $log_level
,
then restart amavis service.
Warning
diff --git a/html/debug.dovecot.html b/html/debug.dovecot.html index dac322de..d50f4f01 100644 --- a/html/debug.dovecot.html +++ b/html/debug.dovecot.html @@ -7,7 +7,13 @@Don't know where Dovecot config files are? check this tutorial: diff --git a/html/debug.iredapd.html b/html/debug.iredapd.html index bec2106f..159f2530 100644 --- a/html/debug.iredapd.html +++ b/html/debug.iredapd.html @@ -7,7 +7,13 @@
Turn on debug mode in iRedAPD
To turn on debug mode in iRedAPD, please set its log level to
debug
in iRedAPD config file/opt/iredapd/settings.py
, then restart iRedAPD diff --git a/html/debug.mysql.html b/html/debug.mysql.html index 9a4d4841..76b33842 100644 --- a/html/debug.mysql.html +++ b/html/debug.mysql.html @@ -7,7 +7,13 @@Log executed SQL commands in MySQL/MariaDB
Don't know where MySQL config file is? check this tutorial: diff --git a/html/debug.openldap.html b/html/debug.openldap.html index 83f5ecd9..46690e43 100644 --- a/html/debug.openldap.html +++ b/html/debug.openldap.html @@ -7,7 +7,13 @@
Turn on debug mode in OpenLDAP
In OpenLDAP config file
slapd.conf
, update parameterloglevel
to value256
, then restart OpenLDAP service.diff --git a/html/debug.roundcubemail.html b/html/debug.roundcubemail.html index dbd9c70c..32ddf56d 100644 --- a/html/debug.roundcubemail.html +++ b/html/debug.roundcubemail.html @@ -7,7 +7,13 @@
Turn on debug mode in Roundcube webmail
Please follow the tutorial to find Roundcube config file (
config/config.inc.php
) first: diff --git a/html/disable.greylisting.html b/html/disable.greylisting.html index 6c128da8..d7a67586 100644 --- a/html/disable.greylisting.html +++ b/html/disable.greylisting.html @@ -7,7 +7,13 @@Disable greylisting in Cluebringer
Warning
diff --git a/html/disable.spam.virus.scanning.for.outgoing.mails.html b/html/disable.spam.virus.scanning.for.outgoing.mails.html index b37c42f0..2a576a63 100644 --- a/html/disable.spam.virus.scanning.for.outgoing.mails.html +++ b/html/disable.spam.virus.scanning.for.outgoing.mails.html @@ -7,7 +7,13 @@Disable spam virus scanning for outgoing mails
To disable spam/virus scanning for outgoing mails, you can add bypass settings in Amavisd config file:
/etc/amavisd/amavisd.conf
(RHEL/CentOS) or diff --git a/html/dovecot.master.user.html b/html/dovecot.master.user.html index 8aef36ad..4badef01 100644 --- a/html/dovecot.master.user.html +++ b/html/dovecot.master.user.html @@ -7,7 +7,13 @@Dovecot Master User: Access user's mailbox without owner's password.
iRedMail-0.8.6 and later releases have Dovecot Master User enabled for all backends (OpenLDAP, MySQL/MariaDB, PostgreSQL) by default, what you need to do diff --git a/html/ejabberd.openldap.ubuntu.html b/html/ejabberd.openldap.ubuntu.html index da3f1380..034c698a 100644 --- a/html/ejabberd.openldap.ubuntu.html +++ b/html/ejabberd.openldap.ubuntu.html @@ -7,7 +7,13 @@
Integrate ejabberd with iRedMail
diff --git a/html/enable.dnsbl.html b/html/enable.dnsbl.html index fb1a0dfa..d601c239 100644 --- a/html/enable.dnsbl.html +++ b/html/enable.dnsbl.html @@ -7,7 +7,13 @@
Enable DNSBL service in Postfix to reduce spam
Important Note
diff --git a/html/enable.postscreen.html b/html/enable.postscreen.html index f9302b54..2360bac2 100644 --- a/html/enable.postscreen.html +++ b/html/enable.postscreen.html @@ -7,7 +7,13 @@Enable postscreen service
diff --git a/html/enable.smtps.html b/html/enable.smtps.html index 77ddf53f..45d88790 100644 --- a/html/enable.smtps.html +++ b/html/enable.smtps.html @@ -7,7 +7,13 @@
Enable SMTPS service (SMTP over SSL, port 465)
diff --git a/html/errors.html b/html/errors.html index 718f1484..48c00584 100644 --- a/html/errors.html +++ b/html/errors.html @@ -7,7 +7,13 @@
Errors you may see while maintaining iRedMail server
diff --git a/html/file.locations.html b/html/file.locations.html index aaa4f316..aa3ef624 100644 --- a/html/file.locations.html +++ b/html/file.locations.html @@ -7,7 +7,13 @@
Locations of configuration and log files of major components
diff --git a/html/force.user.to.change.password.html b/html/force.user.to.change.password.html index 9fd5a62d..cf0ed930 100644 --- a/html/force.user.to.change.password.html +++ b/html/force.user.to.change.password.html @@ -7,7 +7,13 @@
Force mail user to change password in 90 days
How it works
iRedMail configures Roundcube webmail to store last password change date while diff --git a/html/haproxy.keepalived.glusterfs.html b/html/haproxy.keepalived.glusterfs.html index b272186a..2a2ac955 100644 --- a/html/haproxy.keepalived.glusterfs.html +++ b/html/haproxy.keepalived.glusterfs.html @@ -7,7 +7,13 @@
Build an iRedMail fail-over Cluster with KeepAlived, HAProxy, GlusterFS, OpenLDAP, Mariadb
diff --git a/html/ignore.trash.folder.in.quota.html b/html/ignore.trash.folder.in.quota.html index 8659b82d..14093f9a 100644 --- a/html/ignore.trash.folder.in.quota.html +++ b/html/ignore.trash.folder.in.quota.html @@ -7,7 +7,13 @@
Ignore Trash folder in mailbox quota
Per-user mailbox quota rule is defined in Dovecot, in one of below files:
diff --git a/html/index.html b/html/index.html index c21e8ba1..116bf7ad 100644 --- a/html/index.html +++ b/html/index.html @@ -7,7 +7,13 @@
Overview
- Why build your own mail server instead of outsourcing to external entities
diff --git a/html/install.iredadmin.on.debian.html b/html/install.iredadmin.on.debian.html index d11fc877..348e4a15 100644 --- a/html/install.iredadmin.on.debian.html +++ b/html/install.iredadmin.on.debian.html @@ -7,7 +7,13 @@Install iRedAdmin on Debian, Ubuntu
This tutorial is used to install iRedAdmin from scratch, running under Apache diff --git a/html/install.iredadmin.on.freebsd.html b/html/install.iredadmin.on.freebsd.html index 8b1379d7..2d70316d 100644 --- a/html/install.iredadmin.on.freebsd.html +++ b/html/install.iredadmin.on.freebsd.html @@ -7,7 +7,13 @@
Install iRedAdmin on FreeBSD
This tutorial is used to install iRedAdmin from scratch, running under Apache diff --git a/html/install.iredadmin.on.openbsd.html b/html/install.iredadmin.on.openbsd.html index 9b430105..93211804 100644 --- a/html/install.iredadmin.on.openbsd.html +++ b/html/install.iredadmin.on.openbsd.html @@ -7,7 +7,13 @@
Install iRedAdmin on OpenBSD
This tutorial is used to install iRedAdmin from scratch, running under Apache diff --git a/html/install.iredadmin.on.rhel.html b/html/install.iredadmin.on.rhel.html index d65d74cc..6257afd0 100644 --- a/html/install.iredadmin.on.rhel.html +++ b/html/install.iredadmin.on.rhel.html @@ -7,7 +7,13 @@
Install iRedAdmin on Red Hat Enterprise Linux, CentOS, Scientific Linux
This tutorial is used to install iRedAdmin from scratch, running under Apache diff --git a/html/install.iredmail.on.debian.ubuntu.html b/html/install.iredmail.on.debian.ubuntu.html index f88f995e..9d98b724 100644 --- a/html/install.iredmail.on.debian.ubuntu.html +++ b/html/install.iredmail.on.debian.ubuntu.html @@ -7,7 +7,13 @@
Install iRedMail on Debian or Ubuntu Linux
@@ -150,12 +156,9 @@ management and maintenance after installation.
-
- If you choose to store mail accounts in OpenLDAP, iRedMail installer will -ask you two questions about OpenLDAP.
+ ask to set the LDAP suffix.LDAP suffix.
-
Password of LDAP root dn.
-
To MySQL/MariaDB/PostgreSQL users
If you choose to store mail accounts in MySQL/MariaDB/PostgreSQL, iRedMail @@ -220,7 +223,7 @@ Please ALWAYS ALWAYS ALWAYS force users to use a strong passwor message in web browser or mail clients when accessing mailbox via HTTPS/IMAPS/POP3/SMTPS. Let's Encrypt offers FREE SSL certificate. We have a document for you to - use a SSL certificate. + use a SSL certificate.
- If you need to bulk create mail users, check our document for OpenLDAP and MySQL/MariaDB/PostgreSQL.
diff --git a/html/install.iredmail.on.freebsd.html b/html/install.iredmail.on.freebsd.html index 259cd051..a9598025 100644 --- a/html/install.iredmail.on.freebsd.html +++ b/html/install.iredmail.on.freebsd.html @@ -7,7 +7,13 @@Install iRedMail on FreeBSD
@@ -149,12 +155,9 @@ management and maintenance after installation.
-
- If you choose to store mail accounts in OpenLDAP, iRedMail installer will -ask you two questions about OpenLDAP.
+ ask to set the LDAP suffix.LDAP suffix.
-
Password of LDAP root dn.
-
To MySQL/MariaDB/PostgreSQL users
If you choose to store mail accounts in MySQL/MariaDB/PostgreSQL, iRedMail @@ -219,7 +222,7 @@ Please ALWAYS ALWAYS ALWAYS force users to use a strong passwor message in web browser or mail clients when accessing mailbox via HTTPS/IMAPS/POP3/SMTPS. Let's Encrypt offers FREE SSL certificate. We have a document for you to - use a SSL certificate. + use a SSL certificate.
- If you need to bulk create mail users, check our document for OpenLDAP and MySQL/MariaDB/PostgreSQL.
diff --git a/html/install.iredmail.on.freebsd.with.jail.html b/html/install.iredmail.on.freebsd.with.jail.html index 024dc0b4..4856d41b 100644 --- a/html/install.iredmail.on.freebsd.with.jail.html +++ b/html/install.iredmail.on.freebsd.with.jail.html @@ -7,7 +7,13 @@Install iRedMail on FreeBSD inside Jail (with ezjail)
@@ -176,12 +182,9 @@ management and maintenance after installation.
-
- If you choose to store mail accounts in OpenLDAP, iRedMail installer will -ask you two questions about OpenLDAP.
+ ask to set the LDAP suffix.LDAP suffix.
-
Password of LDAP root dn.
-
To MySQL/MariaDB/PostgreSQL users
If you choose to store mail accounts in MySQL/MariaDB/PostgreSQL, iRedMail @@ -246,7 +249,7 @@ Please ALWAYS ALWAYS ALWAYS force users to use a strong passwor message in web browser or mail clients when accessing mailbox via HTTPS/IMAPS/POP3/SMTPS. Let's Encrypt offers FREE SSL certificate. We have a document for you to - use a SSL certificate. + use a SSL certificate.
- If you need to bulk create mail users, check our document for OpenLDAP and MySQL/MariaDB/PostgreSQL.
@@ -264,7 +267,7 @@ hostname or IP address.- Awstats: httpS://your_server/awstats/awstats.pl?config=web (or
?config=smtp
for SMTP log)Get technical support
-Please post all issues, feedbacks, feature requests, suggestions in our online +
Please post all issues, feedbacks, feature requests, suggestions in our online support forum, it's more responsible than you expected.
Some Tips for FreeBSD Jail
diff --git a/html/install.iredmail.on.openbsd.html b/html/install.iredmail.on.openbsd.html index dcf98797..62571c58 100644 --- a/html/install.iredmail.on.openbsd.html +++ b/html/install.iredmail.on.openbsd.html @@ -7,7 +7,13 @@Install iRedMail on OpenBSD
@@ -177,12 +183,9 @@ management and maintenance after installation.
-
- If you choose to store mail accounts in OpenLDAP, iRedMail installer will -ask you two questions about OpenLDAP.
+ ask to set the LDAP suffix.LDAP suffix.
-
Password of LDAP root dn.
-
To MySQL/MariaDB/PostgreSQL users
If you choose to store mail accounts in MySQL/MariaDB/PostgreSQL, iRedMail @@ -247,7 +250,7 @@ Please ALWAYS ALWAYS ALWAYS force users to use a strong passwor message in web browser or mail clients when accessing mailbox via HTTPS/IMAPS/POP3/SMTPS. Let's Encrypt offers FREE SSL certificate. We have a document for you to - use a SSL certificate. + use a SSL certificate.
- If you need to bulk create mail users, check our document for OpenLDAP and MySQL/MariaDB/PostgreSQL.
diff --git a/html/install.iredmail.on.rhel.html b/html/install.iredmail.on.rhel.html index 427c6280..683ea160 100644 --- a/html/install.iredmail.on.rhel.html +++ b/html/install.iredmail.on.rhel.html @@ -7,7 +7,13 @@Install iRedMail on Red Hat Enterprise Linux, CentOS
@@ -33,6 +39,7 @@
This tutorial is available in other languages:
- Russian. Thanks to Everycloudtech.
+- 简体中文
System Requirements
@@ -180,18 +187,10 @@ management and maintenance after installation.
-
- -
+If you choose to store mail accounts in OpenLDAP, iRedMail installer will -ask you two questions about OpenLDAP.
--
-- LDAP suffix.
-- If you choose to store mail accounts in OpenLDAP, iRedMail installer will + ask to set the LDAP suffix.
-
-* Password of LDAP root dn. -
To MySQL/MariaDB/PostgreSQL users
If you choose to store mail accounts in MySQL/MariaDB/PostgreSQL, iRedMail @@ -256,7 +255,7 @@ Please ALWAYS ALWAYS ALWAYS force users to use a strong passwor message in web browser or mail clients when accessing mailbox via HTTPS/IMAPS/POP3/SMTPS. Let's Encrypt offers FREE SSL certificate. We have a document for you to - use a SSL certificate. + use a SSL certificate.
- If you need to bulk create mail users, check our document for OpenLDAP and MySQL/MariaDB/PostgreSQL.
diff --git a/html/install.iredmail.with.remote.mysql.server.html b/html/install.iredmail.with.remote.mysql.server.html index 42b0c1ba..e43a5cc4 100644 --- a/html/install.iredmail.with.remote.mysql.server.html +++ b/html/install.iredmail.with.remote.mysql.server.html @@ -7,7 +7,13 @@Install iRedMail with a remote MySQL server
diff --git a/html/iredadmin-pro.default.password.policy.html b/html/iredadmin-pro.default.password.policy.html index 7bce38c9..9897e8cd 100644 --- a/html/iredadmin-pro.default.password.policy.html +++ b/html/iredadmin-pro.default.password.policy.html @@ -7,7 +7,13 @@
iRedAdmin-Pro: Default password restrictions
iRedAdmin-Pro has some default password restrictions, you can find default settings in file
libs/default_settings.py
under iRedAdmin-Pro directory. diff --git a/html/iredadmin-pro.releases.html b/html/iredadmin-pro.releases.html index 6ba18b31..cc9e54ed 100644 --- a/html/iredadmin-pro.releases.html +++ b/html/iredadmin-pro.releases.html @@ -7,7 +7,13 @@iRedAdmin-Pro (web-based admin panel) release notes and upgrade tutorials
diff --git a/html/iredadmin-pro.restful.api.curl.html b/html/iredadmin-pro.restful.api.curl.html index 3d26c462..424e628c 100644 --- a/html/iredadmin-pro.restful.api.curl.html +++ b/html/iredadmin-pro.restful.api.curl.html @@ -7,7 +7,13 @@
Interact iRedAdmin-Pro RESTful API with
curl
Note
diff --git a/html/iredadmin-pro.restful.api.html b/html/iredadmin-pro.restful.api.html index 45ad0e69..3ebfd95b 100644 --- a/html/iredadmin-pro.restful.api.html +++ b/html/iredadmin-pro.restful.api.html @@ -7,7 +7,13 @@iRedAdmin-Pro: RESTful API
diff --git a/html/iredadmin-pro.restful.api.python.html b/html/iredadmin-pro.restful.api.python.html index f733dfe9..a78c0d59 100644 --- a/html/iredadmin-pro.restful.api.python.html +++ b/html/iredadmin-pro.restful.api.python.html @@ -7,7 +7,13 @@
Interact iRedAdmin-Pro RESTful API with Python
Note
@@ -35,11 +41,9 @@ pw = 'my_password' r = requests.post(url + '/login', data={'username': admin, 'password': pw}) -# Get returned JSON data and get auth_token. +# Get returned JSON data data = r.json() -if data['success']: - auth_token = r.text['auth_token'] -else: +if not data['success']: sys.exit('Login failed') cookies = r.cookies diff --git a/html/iredadmin-pro.self-service.html b/html/iredadmin-pro.self-service.html index 2edfbab8..7078e9ef 100644 --- a/html/iredadmin-pro.self-service.html +++ b/html/iredadmin-pro.self-service.html @@ -7,7 +7,13 @@iRedAdmin-Pro: Enable self-service to allow users to manage their own preferences and more
diff --git a/html/iredapd.releases.html b/html/iredapd.releases.html index 9934d603..f97ab2c1 100644 --- a/html/iredapd.releases.html +++ b/html/iredapd.releases.html @@ -7,7 +7,13 @@
iRedAPD (Postfix Access Policy Daemon) release notes and upgrade tutorials
Note
diff --git a/html/iredmail.releases.html b/html/iredmail.releases.html index 75cc1d39..8c081f81 100644 --- a/html/iredmail.releases.html +++ b/html/iredmail.releases.html @@ -7,7 +7,13 @@iRedMail release notes and upgrade tutorials
diff --git a/html/ldap.add.alias.domain.html b/html/ldap.add.alias.domain.html index 0ad04727..e6490816 100644 --- a/html/ldap.add.alias.domain.html +++ b/html/ldap.add.alias.domain.html @@ -7,7 +7,13 @@
LDAP: Add an alias domain
What an alias domain is used for?
Let's say you have a mail domain
example.com
hosted on your iRedMail server, diff --git a/html/ldap.add.catch-all.html b/html/ldap.add.catch-all.html index 6eeab24e..755e20da 100644 --- a/html/ldap.add.catch-all.html +++ b/html/ldap.add.catch-all.html @@ -7,7 +7,13 @@LDAP: Add per-domain catch-all account
With default setting, iRedMail will reject emails sent to non-existing mail accounts under hosted mail domains. If you want to accept these emails, you diff --git a/html/ldap.add.mail.alias.html b/html/ldap.add.mail.alias.html index 97f69787..474bfb0f 100644 --- a/html/ldap.add.mail.alias.html +++ b/html/ldap.add.mail.alias.html @@ -7,7 +7,13 @@
LDAP: Add a mail alias account
diff --git a/html/ldap.add.mail.list.html b/html/ldap.add.mail.list.html index ca913a32..5691c462 100644 --- a/html/ldap.add.mail.list.html +++ b/html/ldap.add.mail.list.html @@ -7,7 +7,13 @@
LDAP: Add a mail list account
diff --git a/html/ldap.bulk.create.mail.users.html b/html/ldap.bulk.create.mail.users.html index 95adc757..ab0c1be4 100644 --- a/html/ldap.bulk.create.mail.users.html +++ b/html/ldap.bulk.create.mail.users.html @@ -7,7 +7,13 @@
LDAP: Bulk create mail users
iRedMail ships 2 scripts to help you create many mail users quickly.
diff --git a/html/ldap.user.mail.forwarding.html b/html/ldap.user.mail.forwarding.html index c097dd51..45b3d281 100644 --- a/html/ldap.user.mail.forwarding.html +++ b/html/ldap.user.mail.forwarding.html @@ -7,7 +7,13 @@
LDAP: User mail forwarding
diff --git a/html/mailbox.sharing.html b/html/mailbox.sharing.html index 76f2feef..964b6b43 100644 --- a/html/mailbox.sharing.html +++ b/html/mailbox.sharing.html @@ -7,7 +7,13 @@
Mailbox sharing (Sharing IMAP folder with other users)
Note
diff --git a/html/manage.iredapd.html b/html/manage.iredapd.html index 714ac157..8c36df60 100644 --- a/html/manage.iredapd.html +++ b/html/manage.iredapd.html @@ -7,7 +7,13 @@Manage iRedAPD (white/blacklists, greylisting)
diff --git a/html/migrate.or.upgrade.iredadmin.html b/html/migrate.or.upgrade.iredadmin.html index 8df03881..f15610cb 100644 --- a/html/migrate.or.upgrade.iredadmin.html +++ b/html/migrate.or.upgrade.iredadmin.html @@ -7,7 +7,13 @@
Migrate or upgrade iRedAdmin
diff --git a/html/migrate.to.new.iredmail.server.html b/html/migrate.to.new.iredmail.server.html index b3683c7b..8ab91611 100644 --- a/html/migrate.to.new.iredmail.server.html +++ b/html/migrate.to.new.iredmail.server.html @@ -7,7 +7,13 @@
Migrate old iRedMail server to the latest stable release
diff --git a/html/monitor.incoming.and.outgoing.mails.with.bcc.html b/html/monitor.incoming.and.outgoing.mails.with.bcc.html index d3b7e849..d0855d04 100644 --- a/html/monitor.incoming.and.outgoing.mails.with.bcc.html +++ b/html/monitor.incoming.and.outgoing.mails.with.bcc.html @@ -7,7 +7,13 @@
Monitor incoming and outgoing mails with BCC
diff --git a/html/move.detected.spam.to.junk.folder.html b/html/move.detected.spam.to.junk.folder.html index 56542245..1013ffe1 100644 --- a/html/move.detected.spam.to.junk.folder.html +++ b/html/move.detected.spam.to.junk.folder.html @@ -7,7 +7,13 @@
Move detected spam to Junk folder
To move detected spam to user's Junk folder, you need to enable global sieve script in Dovecot.
diff --git a/html/network.ports.html b/html/network.ports.html index 4f9e08a8..588bcf45 100644 --- a/html/network.ports.html +++ b/html/network.ports.html @@ -7,7 +7,13 @@Which network ports are open by iRedMail
diff --git a/html/no.x-spam.headers.html b/html/no.x-spam.headers.html index e974ac2f..95fabcde 100644 --- a/html/no.x-spam.headers.html +++ b/html/no.x-spam.headers.html @@ -7,7 +7,13 @@
Amavisd + SpamAssassin not working? no mail header (X-Spam-*) inserted
Amavisd has below setting in its config file
/etc/amavisd/amavisd.conf
by default:$sa_tag_level_deflt = 2.0; diff --git a/html/password.hashes.html b/html/password.hashes.html index 26ae286f..3e6593eb 100644 --- a/html/password.hashes.html +++ b/html/password.hashes.html @@ -7,7 +7,13 @@
Password hashes
diff --git a/html/per-account.transport.html b/html/per-account.transport.html index b6c43f2d..24b96f53 100644 --- a/html/per-account.transport.html +++ b/html/per-account.transport.html @@ -7,7 +7,13 @@
Per-domain or per-user transport (relay)
diff --git a/html/per-user.send.receive.restrictions.html b/html/per-user.send.receive.restrictions.html index a4bf8352..fbd47cb1 100644 --- a/html/per-user.send.receive.restrictions.html +++ b/html/per-user.send.receive.restrictions.html @@ -7,7 +7,13 @@
[DEPRECATED] Per-user outbound restrictions
WARNING: THIS DOCUMENT IS DEPRECATED, PLEASE DO NOT APPLY IT.
SQL backends
diff --git a/html/performance.tuning.html b/html/performance.tuning.html index 6452ac8c..e5a759bd 100644 --- a/html/performance.tuning.html +++ b/html/performance.tuning.html @@ -7,7 +7,13 @@Performance tuning
diff --git a/html/pipe.incoming.email.for.certain.user.to.external.script.html b/html/pipe.incoming.email.for.certain.user.to.external.script.html index 0ce8f68d..c83b5aa5 100644 --- a/html/pipe.incoming.email.for.certain.user.to.external.script.html +++ b/html/pipe.incoming.email.for.certain.user.to.external.script.html @@ -7,7 +7,13 @@
Pipe incoming email for certain user to external script
This tutorial explains how to pipe incoming email for certain user to external script.
Configure Postfix to use your external script as transport
diff --git a/html/public.folder.html b/html/public.folder.html index 0fe29942..4a20041a 100644 --- a/html/public.folder.html +++ b/html/public.folder.html @@ -7,7 +7,13 @@How to create and manage public folder
diff --git a/html/pureftpd.openldap.centos.html b/html/pureftpd.openldap.centos.html index 9b56bf52..a0d23d19 100644 --- a/html/pureftpd.openldap.centos.html +++ b/html/pureftpd.openldap.centos.html @@ -7,7 +7,13 @@
Install Pure-FTPd with OpenLDAP backend on RHEL/CentOS
diff --git a/html/quarantine.clean.mails.per-user.html b/html/quarantine.clean.mails.per-user.html index adad6d83..dbdc35d5 100644 --- a/html/quarantine.clean.mails.per-user.html +++ b/html/quarantine.clean.mails.per-user.html @@ -7,7 +7,13 @@
Quarantine clean emails sent from/to certain local user
Update Amavisd config file, ask it to listen on one additional network port
diff --git a/html/quarantining.html b/html/quarantining.html index 8d3a2552..14014f6f 100644 --- a/html/quarantining.html +++ b/html/quarantining.html @@ -7,7 +7,13 @@10030
(you're free to use another port), and one additionalpolicy_bank
:Quarantining
diff --git a/html/recalculate.mailbox.quota.html b/html/recalculate.mailbox.quota.html index 970047bf..61a622ac 100644 --- a/html/recalculate.mailbox.quota.html +++ b/html/recalculate.mailbox.quota.html @@ -7,7 +7,13 @@
Force Dovecot to recalculate mailbox quota
Dovecot-2.x
Dovecot provides command line tool
doveadm
to recalcuate mailbox quota. diff --git a/html/reset.user.password.html b/html/reset.user.password.html index f7dad3cf..74149e1e 100644 --- a/html/reset.user.password.html +++ b/html/reset.user.password.html @@ -7,7 +7,13 @@Reset user password
diff --git a/html/restrict.mail.user.to.login.from.specified.ip.or.networks.html b/html/restrict.mail.user.to.login.from.specified.ip.or.networks.html index 16b087b3..035b0959 100644 --- a/html/restrict.mail.user.to.login.from.specified.ip.or.networks.html +++ b/html/restrict.mail.user.to.login.from.specified.ip.or.networks.html @@ -7,7 +7,13 @@
Restrict mail user to login from specified IP addresses or networks
Since iRedMail-0.9.1, it's able to restrict mail users to login from specified IP addresses or networks.
diff --git a/html/send.out.email.from.specified.ip.addresses.html b/html/send.out.email.from.specified.ip.addresses.html index 19a4c4f1..447eae10 100644 --- a/html/send.out.email.from.specified.ip.addresses.html +++ b/html/send.out.email.from.specified.ip.addresses.html @@ -7,7 +7,13 @@Send out email from specified IP address
If you have multiple IP addresses available on your iRedMail server, and would like to send from different IP Addresses for different domains, follow the diff --git a/html/setup.dns.html b/html/setup.dns.html index 5278262f..20347416 100644 --- a/html/setup.dns.html +++ b/html/setup.dns.html @@ -7,7 +7,13 @@
Setup DNS records for your iRedMail server (A, PTR, MX, SPF, DKIM)
diff --git a/html/sign.dkim.signature.for.new.domain.html b/html/sign.dkim.signature.for.new.domain.html index f85bf8ab..2bea07e7 100644 --- a/html/sign.dkim.signature.for.new.domain.html +++ b/html/sign.dkim.signature.for.new.domain.html @@ -7,7 +7,13 @@
Sign DKIM signature on outgoing emails for new mail domain
diff --git a/html/sogo-centos-6-mysql.html b/html/sogo-centos-6-mysql.html index f773602b..6cd32d37 100644 --- a/html/sogo-centos-6-mysql.html +++ b/html/sogo-centos-6-mysql.html @@ -7,7 +7,13 @@
Install SOGo groupware on CentOS 6 with iRedMail (MySQL backend)
diff --git a/html/sogo-centos-6-openldap.html b/html/sogo-centos-6-openldap.html index 8942f31a..a8222186 100644 --- a/html/sogo-centos-6-openldap.html +++ b/html/sogo-centos-6-openldap.html @@ -7,7 +7,13 @@
Install SOGo groupware on CentOS 6 with iRedMail (OpenLDAP backend)
diff --git a/html/sogo.macosx.contacts.html b/html/sogo.macosx.contacts.html index 952472df..94490a6f 100644 --- a/html/sogo.macosx.contacts.html +++ b/html/sogo.macosx.contacts.html @@ -7,7 +7,13 @@
Mac OS X: Add contact service (CardDAV) in Contacts.app
Important Notes
diff --git a/html/sogo.macosx.icalendar.html b/html/sogo.macosx.icalendar.html index 998caa56..aa251ab3 100644 --- a/html/sogo.macosx.icalendar.html +++ b/html/sogo.macosx.icalendar.html @@ -7,7 +7,13 @@Mac OS X: Add calendar (CalDAV) and task (Reminders) service in iCalendar.app
Important Notes
diff --git a/html/sql.bulk.create.mail.users.html b/html/sql.bulk.create.mail.users.html index 77339c44..59837a24 100644 --- a/html/sql.bulk.create.mail.users.html +++ b/html/sql.bulk.create.mail.users.html @@ -7,7 +7,13 @@SQL: Bulk create mail users
iRedMail ships the shell script
diff --git a/html/sql.create.catch-all.html b/html/sql.create.catch-all.html index 77727f08..53bb2df9 100644 --- a/html/sql.create.catch-all.html +++ b/html/sql.create.catch-all.html @@ -7,7 +7,13 @@tools/create_mail_user_SQL.sh
to help you create many mail users quickly.SQL: Add per-domain catch-all account
With default setting, iRedMail will reject emails sent to non-existing mail accounts under hosted mail domains. If you want to accept these emails, you diff --git a/html/sql.create.mail.alias.html b/html/sql.create.mail.alias.html index 35df6c57..faa1327c 100644 --- a/html/sql.create.mail.alias.html +++ b/html/sql.create.mail.alias.html @@ -7,7 +7,13 @@
SQL: Add a mail alias account
diff --git a/html/sql.mark.user.as.admin.html b/html/sql.mark.user.as.admin.html index e131beea..c49f6860 100644 --- a/html/sql.mark.user.as.admin.html +++ b/html/sql.mark.user.as.admin.html @@ -7,7 +7,13 @@
SQL: Mark existing mail user as global domain admin
diff --git a/html/sql.user.mail.forwarding.html b/html/sql.user.mail.forwarding.html index cf0a3008..83aa77ea 100644 --- a/html/sql.user.mail.forwarding.html +++ b/html/sql.user.mail.forwarding.html @@ -7,7 +7,13 @@
SQL: User mail forwarding
diff --git a/html/store.spamassassin.bayes.in.sql.html b/html/store.spamassassin.bayes.in.sql.html index a2ac510f..630f4342 100644 --- a/html/store.spamassassin.bayes.in.sql.html +++ b/html/store.spamassassin.bayes.in.sql.html @@ -7,7 +7,13 @@
Store SpamAssassin bayes in SQL
diff --git a/html/translate.iredadmin.html b/html/translate.iredadmin.html index a757f379..b2fc0532 100644 --- a/html/translate.iredadmin.html +++ b/html/translate.iredadmin.html @@ -7,7 +7,13 @@
iRedAdmin-Pro: Translate iRedAdmin to your local language
If you want to help translate iRedAdmin to your local language, please contact us to get the latest file which contains all translation items. You can open diff --git a/html/unattended.iredmail.installation.html b/html/unattended.iredmail.installation.html index c42b954c..85bdb14c 100644 --- a/html/unattended.iredmail.installation.html +++ b/html/unattended.iredmail.installation.html @@ -7,7 +7,13 @@
Perform silent/unattended iRedMail installation
iRedMail will store configrations in file iRedMail-x.y.z/config during installation, and ask you whether to use it for installation directly diff --git a/html/upgrade.dovecot.1.1.to.1.2.html b/html/upgrade.dovecot.1.1.to.1.2.html index f029750a..8c394f11 100644 --- a/html/upgrade.dovecot.1.1.to.1.2.html +++ b/html/upgrade.dovecot.1.1.to.1.2.html @@ -7,7 +7,13 @@
Upgrade Dovecot from 1.1 to 1.2 on RHEL/CentOS 5.x, Debian 5.
This tutorial is for only RHEL/CentOS 5.x, Debian 5.
Install Dovecot 1.2
diff --git a/html/upgrade.iredapd.html b/html/upgrade.iredapd.html index 33538cd1..eb3e93b7 100644 --- a/html/upgrade.iredapd.html +++ b/html/upgrade.iredapd.html @@ -7,7 +7,13 @@Upgrade iRedAPD
Note
diff --git a/html/upgrade.iredmail.0.3.2-0.4.0.html b/html/upgrade.iredmail.0.3.2-0.4.0.html index 96f8a31a..87809d95 100644 --- a/html/upgrade.iredmail.0.3.2-0.4.0.html +++ b/html/upgrade.iredmail.0.3.2-0.4.0.html @@ -7,7 +7,13 @@Upgrade iRedMail from 0.3.2 to 0.4.0
diff --git a/html/upgrade.iredmail.0.4.0-0.5.0.html b/html/upgrade.iredmail.0.4.0-0.5.0.html index 4cdbb381..5f00ff1f 100644 --- a/html/upgrade.iredmail.0.4.0-0.5.0.html +++ b/html/upgrade.iredmail.0.4.0-0.5.0.html @@ -7,7 +7,13 @@
Upgrade iRedMail from 0.4.0 to 0.5.0
diff --git a/html/upgrade.iredmail.0.5.0-0.5.1.html b/html/upgrade.iredmail.0.5.0-0.5.1.html index 331eefda..c7c5f236 100644 --- a/html/upgrade.iredmail.0.5.0-0.5.1.html +++ b/html/upgrade.iredmail.0.5.0-0.5.1.html @@ -7,7 +7,13 @@
Upgrade iRedMail from 0.5.0 to 0.5.1
diff --git a/html/upgrade.iredmail.0.5.1-0.6.0.html b/html/upgrade.iredmail.0.5.1-0.6.0.html index 652000a7..8e7460ed 100644 --- a/html/upgrade.iredmail.0.5.1-0.6.0.html +++ b/html/upgrade.iredmail.0.5.1-0.6.0.html @@ -7,7 +7,13 @@
Upgrade iRedMail from 0.5.1 to 0.6.0
diff --git a/html/upgrade.iredmail.0.6.0-0.6.1.html b/html/upgrade.iredmail.0.6.0-0.6.1.html index fc847522..0940bf4e 100644 --- a/html/upgrade.iredmail.0.6.0-0.6.1.html +++ b/html/upgrade.iredmail.0.6.0-0.6.1.html @@ -7,7 +7,13 @@
Upgrade iRedMail from 0.6.0 to 0.6.1
diff --git a/html/upgrade.iredmail.0.6.1-0.7.0.html b/html/upgrade.iredmail.0.6.1-0.7.0.html index c8ecabf5..380bbc2a 100644 --- a/html/upgrade.iredmail.0.6.1-0.7.0.html +++ b/html/upgrade.iredmail.0.6.1-0.7.0.html @@ -7,7 +7,13 @@
Upgrade iRedMail from 0.6.1 to 0.7.0
diff --git a/html/upgrade.iredmail.0.7.0-0.7.1.html b/html/upgrade.iredmail.0.7.0-0.7.1.html index 2377321d..a8472b6d 100644 --- a/html/upgrade.iredmail.0.7.0-0.7.1.html +++ b/html/upgrade.iredmail.0.7.0-0.7.1.html @@ -7,7 +7,13 @@
Upgrade iRedMail from 0.7.0 to 0.7.1
diff --git a/html/upgrade.iredmail.0.7.1-0.7.2.html b/html/upgrade.iredmail.0.7.1-0.7.2.html index 95b41d61..2a0e714d 100644 --- a/html/upgrade.iredmail.0.7.1-0.7.2.html +++ b/html/upgrade.iredmail.0.7.1-0.7.2.html @@ -7,7 +7,13 @@
Upgrade iRedMail from 0.7.1 to 0.7.2
diff --git a/html/upgrade.iredmail.0.7.2-0.7.3.html b/html/upgrade.iredmail.0.7.2-0.7.3.html index 01923a34..cdd480ac 100644 --- a/html/upgrade.iredmail.0.7.2-0.7.3.html +++ b/html/upgrade.iredmail.0.7.2-0.7.3.html @@ -7,7 +7,13 @@
Upgrade iRedMail from 0.7.2 to 0.7.3
diff --git a/html/upgrade.iredmail.0.7.3-0.7.4.html b/html/upgrade.iredmail.0.7.3-0.7.4.html index aa11ad3b..13fd7bfe 100644 --- a/html/upgrade.iredmail.0.7.3-0.7.4.html +++ b/html/upgrade.iredmail.0.7.3-0.7.4.html @@ -7,7 +7,13 @@
Upgrade iRedMail from 0.7.3 to 0.7.4
diff --git a/html/upgrade.iredmail.0.7.4-0.8.0.html b/html/upgrade.iredmail.0.7.4-0.8.0.html index d7f8fe27..45b161fb 100644 --- a/html/upgrade.iredmail.0.7.4-0.8.0.html +++ b/html/upgrade.iredmail.0.7.4-0.8.0.html @@ -7,7 +7,13 @@
Upgrade iRedMail from 0.7.4 to 0.8.0
diff --git a/html/upgrade.iredmail.0.8.0-0.8.1.html b/html/upgrade.iredmail.0.8.0-0.8.1.html index 7af7d61d..5aa2f807 100644 --- a/html/upgrade.iredmail.0.8.0-0.8.1.html +++ b/html/upgrade.iredmail.0.8.0-0.8.1.html @@ -7,7 +7,13 @@
Upgrade iRedMail from 0.8.0 to 0.8.1
diff --git a/html/upgrade.iredmail.0.8.1-0.8.2.html b/html/upgrade.iredmail.0.8.1-0.8.2.html index 5acb0ab8..84941de5 100644 --- a/html/upgrade.iredmail.0.8.1-0.8.2.html +++ b/html/upgrade.iredmail.0.8.1-0.8.2.html @@ -7,7 +7,13 @@
Upgrade iRedMail from 0.8.1 to 0.8.2
diff --git a/html/upgrade.iredmail.0.8.2-0.8.3.html b/html/upgrade.iredmail.0.8.2-0.8.3.html index 350161a4..f0800e39 100644 --- a/html/upgrade.iredmail.0.8.2-0.8.3.html +++ b/html/upgrade.iredmail.0.8.2-0.8.3.html @@ -7,7 +7,13 @@
Upgrade iRedMail from 0.8.2 to 0.8.3
diff --git a/html/upgrade.iredmail.0.8.3-0.8.4.html b/html/upgrade.iredmail.0.8.3-0.8.4.html index 265d498b..877097ca 100644 --- a/html/upgrade.iredmail.0.8.3-0.8.4.html +++ b/html/upgrade.iredmail.0.8.3-0.8.4.html @@ -7,7 +7,13 @@
Upgrade iRedMail from 0.8.3 to 0.8.4
diff --git a/html/upgrade.iredmail.0.8.4-0.8.5.html b/html/upgrade.iredmail.0.8.4-0.8.5.html index a15147ca..a543099a 100644 --- a/html/upgrade.iredmail.0.8.4-0.8.5.html +++ b/html/upgrade.iredmail.0.8.4-0.8.5.html @@ -7,7 +7,13 @@
Upgrade iRedMail from 0.8.4 to 0.8.5
diff --git a/html/upgrade.iredmail.0.8.5-0.8.6.html b/html/upgrade.iredmail.0.8.5-0.8.6.html index ede03dd6..a2ccd10b 100644 --- a/html/upgrade.iredmail.0.8.5-0.8.6.html +++ b/html/upgrade.iredmail.0.8.5-0.8.6.html @@ -7,7 +7,13 @@
Upgrade iRedMail from 0.8.5 to 0.8.6
diff --git a/html/upgrade.iredmail.0.8.6-0.8.7.html b/html/upgrade.iredmail.0.8.6-0.8.7.html index e04b6761..079553b1 100644 --- a/html/upgrade.iredmail.0.8.6-0.8.7.html +++ b/html/upgrade.iredmail.0.8.6-0.8.7.html @@ -7,7 +7,13 @@
Upgrade iRedMail from 0.8.6 to 0.8.7
diff --git a/html/upgrade.iredmail.0.8.7-0.9.0.html b/html/upgrade.iredmail.0.8.7-0.9.0.html index 2f379c65..b94c19da 100644 --- a/html/upgrade.iredmail.0.8.7-0.9.0.html +++ b/html/upgrade.iredmail.0.8.7-0.9.0.html @@ -7,7 +7,13 @@
Upgrade iRedMail from 0.8.7 to 0.9.0
diff --git a/html/upgrade.iredmail.0.9.0-0.9.1.html b/html/upgrade.iredmail.0.9.0-0.9.1.html index 9689cc79..b0e1157a 100644 --- a/html/upgrade.iredmail.0.9.0-0.9.1.html +++ b/html/upgrade.iredmail.0.9.0-0.9.1.html @@ -7,7 +7,13 @@
Upgrade iRedMail from 0.9.0 to 0.9.1
@@ -483,8 +489,7 @@ from specified IP/networks.
Restarting Dovecot service is required.
Sample usage: allow user
+and networkuser@domain.com
to login from IP172.16.244.1
-and network192.168.1.0/24
: -192.168.1.0/24
:dn: mail=user@domain.com,ou=Users,domainName=domain.com,o=domains,dc=xx,dc=xx objectClass: mailUser @@ -567,8 +572,7 @@ mysql> ALTER TABLE mailbox ADD COLUMN `allow_nets` TEXT DEFAULT NULL;
Restarting Dovecot service is required.
Sample usage: allow user
+and networkuser@domain.com
to login from IP172.16.244.1
-and network192.168.1.0/24
: -192.168.1.0/24
:sql> USE vmail; sql> UPDATE mailbox SET allow_nets='172.16.244.1,192.168.1.0/24' WHERE username='user@domain.com`; @@ -669,8 +673,7 @@ sql> ALTER TABLE mailbox ADD COLUMN allow_nets TEXT DEFAULT NULL;
Restarting Dovecot service is required.
Sample usage: allow user
+and networkuser@domain.com
to login from IP172.16.244.1
-and network192.168.1.0/24
: -192.168.1.0/24
:sql> \c vmail; sql> UPDATE mailbox SET allow_nets='172.16.244.1,192.168.1.0/24' WHERE username='user@domain.com`; diff --git a/html/upgrade.iredmail.0.9.1-0.9.2.html b/html/upgrade.iredmail.0.9.1-0.9.2.html index 39112c2f..b64c6a2b 100644 --- a/html/upgrade.iredmail.0.9.1-0.9.2.html +++ b/html/upgrade.iredmail.0.9.1-0.9.2.html @@ -7,7 +7,13 @@
Upgrade iRedMail from 0.9.1 to 0.9.2
diff --git a/html/upgrade.iredmail.0.9.2-0.9.3.html b/html/upgrade.iredmail.0.9.2-0.9.3.html index fa9e7800..c26c41c2 100644 --- a/html/upgrade.iredmail.0.9.2-0.9.3.html +++ b/html/upgrade.iredmail.0.9.2-0.9.3.html @@ -7,7 +7,13 @@
Upgrade iRedMail from 0.9.2 to 0.9.3
@@ -762,8 +768,7 @@ sql> ALTER TABLE alias ADD INDEX (alias_to);
Sample usage: add additional email addresses
+existing userextra@domain.com
for -existing useruser@domain.com
: -user@domain.com
:sql> USE vmail; sql> INSERT INTO alias (address, goto, is_alias, alias_to, domain) @@ -865,8 +870,7 @@ sql> CREATE INDEX idx_alias_alias_to ON alias (alias_to);
Sample usage: add additional email addresses
+existing userextra@domain.com
for -existing useruser@domain.com
: -user@domain.com
:sql> USE vmail; sql> INSERT INTO alias (address, goto, is_alias, alias_to, domain) diff --git a/html/upgrade.iredmail.0.9.3-0.9.4.html b/html/upgrade.iredmail.0.9.3-0.9.4.html index 12c2aef3..13ab3962 100644 --- a/html/upgrade.iredmail.0.9.3-0.9.4.html +++ b/html/upgrade.iredmail.0.9.3-0.9.4.html @@ -7,7 +7,13 @@
Upgrade iRedMail from 0.9.3 to 0.9.4
diff --git a/html/upgrade.iredmail.0.9.4-0.9.5.html b/html/upgrade.iredmail.0.9.4-0.9.5.html index c4579208..407c622d 100644 --- a/html/upgrade.iredmail.0.9.4-0.9.5.html +++ b/html/upgrade.iredmail.0.9.4-0.9.5.html @@ -7,7 +7,13 @@
Upgrade iRedMail from 0.9.4 to 0.9.5
diff --git a/html/upgrade.old.iredapd.html b/html/upgrade.old.iredapd.html index c5328782..53755bfe 100644 --- a/html/upgrade.old.iredapd.html +++ b/html/upgrade.old.iredapd.html @@ -7,7 +7,13 @@
Upgrade iRedAPD from v1.3.x or earlier versions to latest release
iRedAPD source code is hosted on BitBucket.
diff --git a/html/upgrade.sogo.2.to.3.html b/html/upgrade.sogo.2.to.3.html index 61e58ba3..388907e1 100644 --- a/html/upgrade.sogo.2.to.3.html +++ b/html/upgrade.sogo.2.to.3.html @@ -7,7 +7,13 @@Upgrade SOGo from v2 to v3
diff --git a/html/use.a.bought.ssl.certificate.html b/html/use.a.bought.ssl.certificate.html index ca1e2a35..acf2b88a 100644 --- a/html/use.a.bought.ssl.certificate.html +++ b/html/use.a.bought.ssl.certificate.html @@ -7,7 +7,13 @@
Use a bought SSL certificate
diff --git a/html/use.openldap.as.address.book.in.outlook.html b/html/use.openldap.as.address.book.in.outlook.html index df5b0d6e..3197fb4b 100644 --- a/html/use.openldap.as.address.book.in.outlook.html +++ b/html/use.openldap.as.address.book.in.outlook.html @@ -7,7 +7,13 @@
Use OpenLDAP as address book in Microsoft Outlook
Tested with Outlook 2007:
diff --git a/html/used.components.html b/html/used.components.html index 327e3366..d3163176 100644 --- a/html/used.components.html +++ b/html/used.components.html @@ -7,7 +7,13 @@
Major open source softwares used in iRedMail
diff --git a/html/why.append.timestamp.in.maildir.path.html b/html/why.append.timestamp.in.maildir.path.html index 24295717..778d2616 100644 --- a/html/why.append.timestamp.in.maildir.path.html +++ b/html/why.append.timestamp.in.maildir.path.html @@ -7,7 +7,13 @@
Why append timestamp in maildir path
iRedMail will append timestamp in maildir path by default, here's why.
Depends on the tools/scripts you used to create mail accounts, it's tunable diff --git a/html/why.build.your.own.mail.server.html b/html/why.build.your.own.mail.server.html index caf0b88f..72964276 100644 --- a/html/why.build.your.own.mail.server.html +++ b/html/why.build.your.own.mail.server.html @@ -7,7 +7,13 @@
Why build your own mail server instead of outsourcing to external entities
Quote from Spamhaus news article:
diff --git a/html/zh_CN/allow.member.to.send.email.as.mail.list.html b/html/zh_CN/allow.member.to.send.email.as.mail.list.html index a1473576..bc51cce1 100644 --- a/html/zh_CN/allow.member.to.send.email.as.mail.list.html +++ b/html/zh_CN/allow.member.to.send.email.as.mail.list.html @@ -7,7 +7,13 @@允许列表成员以列表邮件地址作为发件人发送邮件
要允许列表成员以列表邮件地址作为发件人发送邮件,请按照以下步骤操作:
diff --git a/html/zh_CN/allow.user.to.send.email.without.authentication.html b/html/zh_CN/allow.user.to.send.email.without.authentication.html index 5c9bb07b..c7a2f59a 100644 --- a/html/zh_CN/allow.user.to.send.email.without.authentication.html +++ b/html/zh_CN/allow.user.to.send.email.without.authentication.html @@ -7,7 +7,13 @@
允许用户无需身份验证发送邮件
创建文本文件
diff --git a/html/zh_CN/change.mail.attachment.size.html b/html/zh_CN/change.mail.attachment.size.html index b1273938..62cf30fd 100644 --- a/html/zh_CN/change.mail.attachment.size.html +++ b/html/zh_CN/change.mail.attachment.size.html @@ -7,7 +7,13 @@/etc/postfix/accepted_unauth_senders
,列出无需身份验证就可以 发送邮件的用户邮件地址。下面以用户user@example.com
为例:修改邮件附件大小
diff --git a/html/zh_CN/change.server.hostname.html b/html/zh_CN/change.server.hostname.html index 6d7e8fa3..b6171e03 100644 --- a/html/zh_CN/change.server.hostname.html +++ b/html/zh_CN/change.server.hostname.html @@ -7,7 +7,13 @@
修改服务器主机名
要在安装 iRedMail 后修改服务器的主机名,请将以下文件中的旧主机名改为新主机名:
系统配置文件
diff --git a/html/zh_CN/debug.amavisd.html b/html/zh_CN/debug.amavisd.html index ab323366..92f0bfcf 100644 --- a/html/zh_CN/debug.amavisd.html +++ b/html/zh_CN/debug.amavisd.html @@ -7,7 +7,13 @@调试 Amavisd 和 SpamAssassin
找到Amavisd 配置文件,修改
diff --git a/html/zh_CN/debug.dovecot.html b/html/zh_CN/debug.dovecot.html index f1359b08..9523e156 100644 --- a/html/zh_CN/debug.dovecot.html +++ b/html/zh_CN/debug.dovecot.html @@ -7,7 +7,13 @@$log_level
参数, 然后重启 amavisd 服务。开启 Dovecot 调试模式
不知道 Dovecot 的配置文件在哪个目录?请查阅这个教程: diff --git a/html/zh_CN/disable.greylisting.html b/html/zh_CN/disable.greylisting.html index 787fab44..82f1bcd1 100644 --- a/html/zh_CN/disable.greylisting.html +++ b/html/zh_CN/disable.greylisting.html @@ -7,7 +7,13 @@
禁用 Clubbringer 提供的灰名单服务
- 先查阅文档确认 Cluebringer 配置文件
cluebringer.conf
的具体路径: diff --git a/html/zh_CN/disable.spam.virus.scanning.for.outgoing.mails.html b/html/zh_CN/disable.spam.virus.scanning.for.outgoing.mails.html index cb609938..248ee0ec 100644 --- a/html/zh_CN/disable.spam.virus.scanning.for.outgoing.mails.html +++ b/html/zh_CN/disable.spam.virus.scanning.for.outgoing.mails.html @@ -7,7 +7,13 @@对外发邮件禁用垃圾扫描、病毒扫描
要对外发邮件禁用垃圾扫描、病毒扫描功能,可以在 Amavisd 配置文件
/etc/amavisd/amavisd.conf
(RHEL/CentOS) 或/etc/amavis/conf.d/50-user
diff --git a/html/zh_CN/ignore.trash.folder.in.quota.html b/html/zh_CN/ignore.trash.folder.in.quota.html index f6b3e3fe..92fe6ead 100644 --- a/html/zh_CN/ignore.trash.folder.in.quota.html +++ b/html/zh_CN/ignore.trash.folder.in.quota.html @@ -7,7 +7,13 @@在邮箱配额中忽略垃圾箱目录
在 Dovecot 中,针对单个用户的邮箱配额限制定义在下列文件之一:
diff --git a/html/zh_CN/index.html b/html/zh_CN/index.html index 27e1e370..be187ab0 100644 --- a/html/zh_CN/index.html +++ b/html/zh_CN/index.html @@ -7,7 +7,13 @@
迁移
- 密码
diff --git a/html/zh_CN/install.iredmail.on.rhel.html b/html/zh_CN/install.iredmail.on.rhel.html new file mode 100644 index 00000000..a4a1162f --- /dev/null +++ b/html/zh_CN/install.iredmail.on.rhel.html @@ -0,0 +1,226 @@ + + + +在 Red Hat Enterprise Linux 或 CentOS 系统上安装 iRedMail + + + + +在 Red Hat Enterprise Linux 或 CentOS 系统上安装 iRedMail
++ ++++该文档有其它语言的版本:
++
+- English
+- Russian. Thanks to Everycloudtech.
+系统要求
+++Warning
+iRedMail 只针对全新安装的操作系统设计,它要求你的操作系统上__没有__事先 +安装邮件服务相关的组件,例如 MySQL,OpenLDAP,Postfix,Amavisd,等。 +iRedMail 会自动安装和配置邮件服务所需的组件,因此如果操作系统上已有相关 +组件,iRedMail 可能会打乱你的配置并造成服务无法正常启动。
+要在 Red Hat Enterprise Linux (以下简称 RHEL)或 CentOS 上安装 iRedMail,你需要:
++
+- 一个全新安装的 RHEL 或 CentOS 系统。支持的版本号在下载页面有注明。
+- 要运行一个低流量的邮件服务器,要求至少
+2 GB
内存才能使用完整的垃圾邮件和病毒扫描功能。准备
+为服务器设置一个完整域名(FQDN)的主机名
+不管你的服务器将用于实际运行还是仅仅用作测试,都建议设置一个完整域名(FQDN)的主机名。
+输入命令
+hostname -f
查看当前的主机名+ +$ hostname -f +mx.example.com +
在 RHEL/CentOS 系统上,主机名需要在两个文件里设置:
++
+- 对于 RHEL/CentOS 6,主机名定义在
+/etc/sysconfig/network
:+ +HOSTNAME=mx.example.com +
对于 RHEL/CentOS 7,主机名定义在
+/etc/hostname
.+ +mx.example.com +
+
+- 在
+/etc/hosts
里定义主机名和 IP 地址的对应关系。注意:一定要将 FQDN 主机名列在第一个。+ +127.0.0.1 mx.example.com mx localhost localhost.localdomain +
确认系统已使用设置好的 FQDN 作为主机名。如果没有生效,请重启系统。
++ +$ hostname -f +mx.example.com +
禁用 SELinux
+iRedMail 不支持 SELinux,所以需要在
+/etc/selinux/config
文件里禁用它。+ +SELINUX=disabled +
如果不希望禁用 SELinux,可以设置为让它打印警告信息但不强制限制:
++ +SELINUX=permissive +
也可以无须重启服务就禁用它:
++ +# setenforce 0 +
启用必须的 yum 仓库
++
+- +
+对于 CentOS 系统,必须启用
+/etc/yum.repos.d/CentOS-Base.repo
里定义的所有 + CentOS 官方 yum 仓库。同时__禁用__所有第三方yum 仓库,以避免软件包冲突。- +
+对于 RHEL,请启用 Red Hat Network 以便安装软件包。
+下载最新的 iRedMail
++
+- 访问下载页面下载最新的版本。
+- 上传 iRedMail 到服务器上。假设上传后的路径是
+/root/iRedMail-x.y.z.tar.bz2
+ (这里以x.y.z
代替实际的版本号)。- 解压缩 iRedMail 安装包:
++ +# cd /root/ +# tar xjf iRedMail-x.y.z.tar.bz2 +
运行 iRedMail 安装程序
+现在可以运行 iRedMail 安装程序了,它会问你几个简单的问题,仅此而已。
++ +# cd /root/iRedMail-x.y.z/ +# IREDMAIL_MIRROR='http://42.159.241.31' IREDMAIL_EPEL_MIRROR='http://mirrors.aliyun.com/epel' bash iRedMail.sh +
++由于 iredmail.org 域名在国内无法访问,所以需要指定
+IREDMAIL_MIRROR
参数使用 +国内镜像站点。IREDMAIL_EPEL_MIRROR
则是为了加快安装速度而选择的国内的阿里云 +提供的 EPEL 软件包仓库镜像。安装过程的截图
++
+- 欢迎和感谢使用
++
+
+- 指定用于存储用户邮箱的路径。默认是
+/var/vmail/
。+
+
+- 选择用于存储邮件账号的数据库。
+++Note
+各个数据库之间没有太大区别,建议使用自己熟悉的数据库,便于后期维护。
++
+
+- 如果选择 OpenLDAP 数据库用于存储邮件账号,安装程序会要求你输入 LDAP 前缀:
++
++MySQL/MariaDB/PostgreSQL 用户
+如果选择 MySQL/MariaDB/PostgreSQL 用于存储邮件账号, 安装程序会为数据库的 +root 用户生成一个随机的强密码,安装完成后可以在
+iRedMail.tips
文件里找到。+
+- 添加第一个邮件域名
++
+
+- 设置邮件管理员的密码
+++Note
+该账号即是邮件管理员,也是普通的邮件账号,可以登录管理后台和 webmail。
++
+
+- 可选的组件
++
回答完上面的几个问题之后,安装程序会列出本次安装的基本信息并要求确认是否实际 +执行安装,请输入
+y
或Y
并按回车键确认,或n
,N
并按回车键中止安装。安装完成后你必须知道的几个重要事项
++
+- 邮件服务器最薄弱的环节是用户的弱密码,所以请一定强制你的用户使用强度高的密码。
+- +
+阅读
+/root/iRedMail-x.y.z/iRedMail.tips
文件,它包含了:+
+- 各个 web 程序的访问地址(URL),用户名和密码。
+- 各个组件的配置文件路径。除此之外还应该阅读文档:Locations of configuration and log files of major components.
+- 以及其它一些重要和敏感信息
+- + +
+- 如何配置邮件客户端程序
+- 强烈建议获取 SSL 证书以避免每次访问 web 程序时烦人的自签名 SSL 证书警告, + Let's Encrypt 提供免费的 SSL 证书。可根据该文档 + 配置获取的证书:use a SSL certificate.
+- 如果需要批量添加邮件账号,可以参考以下针对不同数据库的批量建账号的文档: + OpenLDAP, + MySQL/MariaDB/PostgreSQL。
+- 如果这是一台繁忙的服务器,这里有一些提升性能的建议。
+访问 webmail 和其它 web 程序
+安装完成后,可以通过以下 URL 访问相关程序。注意:请将
+<server\>
替换为实际的 +服务器地址。+
+- Roundcube webmail: https://your_server/mail/
+- SOGo Groupware: https://your_server/SOGo
+- Web 管理后台: httpS://your_server/iredadmin/
+- Awstats: httpS://your_server/awstats/awstats.pl?config=web (or
+?config=smtp
for SMTP log)技术支持
+All documents are available in BitBucket repository, and published under Creative Commons license. If you found something wrong, please do contact us to fix it. + \ No newline at end of file diff --git a/html/zh_CN/mailbox.sharing.html b/html/zh_CN/mailbox.sharing.html index e2a3a2bc..17fd06d8 100644 --- a/html/zh_CN/mailbox.sharing.html +++ b/html/zh_CN/mailbox.sharing.html @@ -7,7 +7,13 @@
共享邮箱(将 IMAP 目录共享给其他用户)
自 iRedMail-
diff --git a/html/zh_CN/no.x-spam.headers.html b/html/zh_CN/no.x-spam.headers.html index 6a3c31ed..6d6575d6 100644 --- a/html/zh_CN/no.x-spam.headers.html +++ b/html/zh_CN/no.x-spam.headers.html @@ -7,7 +7,13 @@0.9.0
版起,共享邮箱功能默认开户,用户不需要任何额外的配置。Amavisd + SpamAssassin 无效,邮件头无 X-Spam-* 信息插入
在 Amavisd 的配置文件
/etc/amavisd/amavisd.conf
中有如下默认设置:$sa_tag_level_deflt = 2.0; diff --git a/html/zh_CN/password.hashes.html b/html/zh_CN/password.hashes.html index 9802ec41..a0faa1ab 100644 --- a/html/zh_CN/password.hashes.html +++ b/html/zh_CN/password.hashes.html @@ -7,7 +7,13 @@
密码
iRedMail 支持的密码
在 iRedMail 中,Doevcot 被配置为 Postfix 的 SASL 认证服务器,因此,Dovecot 支持 diff --git a/html/zh_CN/performance.tuning.html b/html/zh_CN/performance.tuning.html index 26cd7548..a030354e 100644 --- a/html/zh_CN/performance.tuning.html +++ b/html/zh_CN/performance.tuning.html @@ -7,7 +7,13 @@
性能优化
diff --git a/html/zh_CN/reset.user.password.html b/html/zh_CN/reset.user.password.html index b70c138d..c729aa5a 100644 --- a/html/zh_CN/reset.user.password.html +++ b/html/zh_CN/reset.user.password.html @@ -7,7 +7,13 @@
重置用户密码
diff --git a/html/zh_CN/use.a.bought.ssl.certificate.html b/html/zh_CN/use.a.bought.ssl.certificate.html index e34d6c67..88c1a5ad 100644 --- a/html/zh_CN/use.a.bought.ssl.certificate.html +++ b/html/zh_CN/use.a.bought.ssl.certificate.html @@ -7,7 +7,13 @@
使用购买的 SSL 证书
diff --git a/tools/markdown2html.py b/tools/markdown2html.py index 017f8e9b..d7f4da28 100644 --- a/tools/markdown2html.py +++ b/tools/markdown2html.py @@ -33,6 +33,10 @@ for arg in args: if not 'css' in cmd_opts: cmd_opts['css'] = './css/markdown.css' +cmd_opts['dir_base'] = '.' +if 'is_sub_folder=YES' in args: + cmd_opts['dir_base'] = './..' + # Get article title if not 'title' in cmd_opts: cmd_opts['title'] = commands.getoutput("""grep 'Title:' %s |awk -F'Title: ' '{print $2}'""" % filename) @@ -58,8 +62,14 @@ html = """\ # Link to iRedMail.org html += """