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