From f5237e66fd0024c9b42400bca86cf9ae34b06ac8 Mon Sep 17 00:00:00 2001 From: Zhang Huangbin Date: Wed, 20 Apr 2016 01:48:51 +0800 Subject: [PATCH] New: html/zh_CN/install.iredmail.on.rhel.html. --- convert.sh | 10 +- .../faq/0-iredadmin-pro.restful.api.python.md | 6 +- .../0-install.iredmail.on.debian.ubuntu.md | 10 +- .../0-install.iredmail.on.freebsd.md | 10 +- ...0-install.iredmail.on.freebsd.with.jail.md | 10 +- .../0-install.iredmail.on.openbsd.md | 10 +- .../0-install.iredmail.on.rhel.md | 11 +- html/active.directory.html | 8 +- html/activesync.android.html | 8 +- html/activesync.bb10.html | 8 +- html/activesync.ios.html | 8 +- html/activesync.outlook.html | 8 +- html/additional.smtp.port.html | 8 +- ...users.to.send.email.as.different.user.html | 8 +- ...w.insecure.pop3.imap.smtp.connections.html | 8 +- ...low.member.to.send.email.as.mail.list.html | 8 +- ....to.send.email.without.authentication.html | 8 +- html/amavisd.per-recipient.policy.lookup.html | 8 +- html/amavisd.sql.db.html | 8 +- html/amavisd.wblist.html | 8 +- html/authenticate.without.domain.name.html | 8 +- html/backup.restore.html | 8 +- html/change.mail.attachment.size.html | 8 +- html/change.server.hostname.html | 8 +- html/cluebringer.to.iredapd.html | 8 +- ...y.disable.amavisd.clamav.spamassassin.html | 8 +- html/concurrent.processing.html | 8 +- html/configure.thunderbird.html | 8 +- html/customize.maildir.path.html | 8 +- html/dbmail.mysql.centos.html | 8 +- html/debug.amavisd.html | 8 +- html/debug.cluebringer.html | 8 +- html/debug.dovecot.html | 8 +- html/debug.iredapd.html | 8 +- html/debug.mysql.html | 8 +- html/debug.openldap.html | 8 +- html/debug.roundcubemail.html | 8 +- html/disable.greylisting.html | 8 +- ...pam.virus.scanning.for.outgoing.mails.html | 8 +- html/dovecot.master.user.html | 8 +- html/ejabberd.openldap.ubuntu.html | 8 +- html/enable.dnsbl.html | 8 +- html/enable.postscreen.html | 8 +- html/enable.smtps.html | 8 +- html/errors.html | 8 +- html/file.locations.html | 8 +- html/force.user.to.change.password.html | 8 +- html/haproxy.keepalived.glusterfs.html | 8 +- html/ignore.trash.folder.in.quota.html | 8 +- html/index.html | 8 +- html/install.iredadmin.on.debian.html | 8 +- html/install.iredadmin.on.freebsd.html | 8 +- html/install.iredadmin.on.openbsd.html | 8 +- html/install.iredadmin.on.rhel.html | 8 +- html/install.iredmail.on.debian.ubuntu.html | 15 +- html/install.iredmail.on.freebsd.html | 15 +- ...install.iredmail.on.freebsd.with.jail.html | 17 +- html/install.iredmail.on.openbsd.html | 15 +- html/install.iredmail.on.rhel.html | 23 +- ...all.iredmail.with.remote.mysql.server.html | 8 +- ...iredadmin-pro.default.password.policy.html | 8 +- html/iredadmin-pro.releases.html | 8 +- html/iredadmin-pro.restful.api.curl.html | 8 +- html/iredadmin-pro.restful.api.html | 8 +- html/iredadmin-pro.restful.api.python.html | 14 +- html/iredadmin-pro.self-service.html | 8 +- html/iredapd.releases.html | 8 +- html/iredmail.releases.html | 8 +- html/ldap.add.alias.domain.html | 8 +- html/ldap.add.catch-all.html | 8 +- html/ldap.add.mail.alias.html | 8 +- html/ldap.add.mail.list.html | 8 +- html/ldap.bulk.create.mail.users.html | 8 +- html/ldap.user.mail.forwarding.html | 8 +- html/mailbox.sharing.html | 8 +- html/manage.iredapd.html | 8 +- html/migrate.or.upgrade.iredadmin.html | 8 +- html/migrate.to.new.iredmail.server.html | 8 +- ....incoming.and.outgoing.mails.with.bcc.html | 8 +- html/move.detected.spam.to.junk.folder.html | 8 +- html/network.ports.html | 8 +- html/no.x-spam.headers.html | 8 +- html/password.hashes.html | 8 +- html/per-account.transport.html | 8 +- html/per-user.send.receive.restrictions.html | 8 +- html/performance.tuning.html | 8 +- ...l.for.certain.user.to.external.script.html | 8 +- html/public.folder.html | 8 +- html/pureftpd.openldap.centos.html | 8 +- html/quarantine.clean.mails.per-user.html | 8 +- html/quarantining.html | 8 +- html/recalculate.mailbox.quota.html | 8 +- html/reset.user.password.html | 8 +- ...o.login.from.specified.ip.or.networks.html | 8 +- ...out.email.from.specified.ip.addresses.html | 8 +- html/setup.dns.html | 8 +- html/sign.dkim.signature.for.new.domain.html | 8 +- html/sogo-centos-6-mysql.html | 8 +- html/sogo-centos-6-openldap.html | 8 +- html/sogo.macosx.contacts.html | 8 +- html/sogo.macosx.icalendar.html | 8 +- html/sql.bulk.create.mail.users.html | 8 +- html/sql.create.catch-all.html | 8 +- html/sql.create.mail.alias.html | 8 +- html/sql.mark.user.as.admin.html | 8 +- html/sql.user.mail.forwarding.html | 8 +- html/store.spamassassin.bayes.in.sql.html | 8 +- html/translate.iredadmin.html | 8 +- html/unattended.iredmail.installation.html | 8 +- html/upgrade.dovecot.1.1.to.1.2.html | 8 +- html/upgrade.iredapd.html | 8 +- html/upgrade.iredmail.0.3.2-0.4.0.html | 8 +- html/upgrade.iredmail.0.4.0-0.5.0.html | 8 +- html/upgrade.iredmail.0.5.0-0.5.1.html | 8 +- html/upgrade.iredmail.0.5.1-0.6.0.html | 8 +- html/upgrade.iredmail.0.6.0-0.6.1.html | 8 +- html/upgrade.iredmail.0.6.1-0.7.0.html | 8 +- html/upgrade.iredmail.0.7.0-0.7.1.html | 8 +- html/upgrade.iredmail.0.7.1-0.7.2.html | 8 +- html/upgrade.iredmail.0.7.2-0.7.3.html | 8 +- html/upgrade.iredmail.0.7.3-0.7.4.html | 8 +- html/upgrade.iredmail.0.7.4-0.8.0.html | 8 +- html/upgrade.iredmail.0.8.0-0.8.1.html | 8 +- html/upgrade.iredmail.0.8.1-0.8.2.html | 8 +- html/upgrade.iredmail.0.8.2-0.8.3.html | 8 +- html/upgrade.iredmail.0.8.3-0.8.4.html | 8 +- html/upgrade.iredmail.0.8.4-0.8.5.html | 8 +- html/upgrade.iredmail.0.8.5-0.8.6.html | 8 +- html/upgrade.iredmail.0.8.6-0.8.7.html | 8 +- html/upgrade.iredmail.0.8.7-0.9.0.html | 8 +- html/upgrade.iredmail.0.9.0-0.9.1.html | 17 +- html/upgrade.iredmail.0.9.1-0.9.2.html | 8 +- html/upgrade.iredmail.0.9.2-0.9.3.html | 14 +- html/upgrade.iredmail.0.9.3-0.9.4.html | 8 +- html/upgrade.iredmail.0.9.4-0.9.5.html | 8 +- html/upgrade.old.iredapd.html | 8 +- html/upgrade.sogo.2.to.3.html | 8 +- html/use.a.bought.ssl.certificate.html | 8 +- ...e.openldap.as.address.book.in.outlook.html | 8 +- html/used.components.html | 8 +- .../why.append.timestamp.in.maildir.path.html | 8 +- html/why.build.your.own.mail.server.html | 8 +- ...low.member.to.send.email.as.mail.list.html | 8 +- ....to.send.email.without.authentication.html | 8 +- html/zh_CN/change.mail.attachment.size.html | 8 +- html/zh_CN/change.server.hostname.html | 8 +- html/zh_CN/debug.amavisd.html | 8 +- html/zh_CN/debug.dovecot.html | 8 +- html/zh_CN/disable.greylisting.html | 8 +- ...pam.virus.scanning.for.outgoing.mails.html | 8 +- html/zh_CN/ignore.trash.folder.in.quota.html | 8 +- html/zh_CN/index.html | 8 +- html/zh_CN/install.iredmail.on.rhel.html | 226 ++++++++++++++++++ html/zh_CN/mailbox.sharing.html | 8 +- html/zh_CN/no.x-spam.headers.html | 8 +- html/zh_CN/password.hashes.html | 8 +- html/zh_CN/performance.tuning.html | 8 +- html/zh_CN/reset.user.password.html | 8 +- html/zh_CN/use.a.bought.ssl.certificate.html | 8 +- tools/markdown2html.py | 14 +- .../0-install.iredmail.on.rhel.md | 197 +++++++++++++++ 161 files changed, 1533 insertions(+), 245 deletions(-) create mode 100644 html/zh_CN/install.iredmail.on.rhel.html create mode 100644 zh_CN/installation/0-install.iredmail.on.rhel.md 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 @@

Integrate Microsoft Active Directory in iRedMail