From bd5875349d8418752303b7e97344897c9d2b5968 Mon Sep 17 00:00:00 2001 From: Zhang Huangbin Date: Wed, 25 Mar 2015 20:36:46 +0800 Subject: [PATCH] Sync upgrade tutorial for new LDAP attribute 'allowNets' and SQL column 'mailbox.allow_nets'. --- TODO.md | 2 + convert.sh | 16 +- html/css/markdown.css | 1 + html/upgrade.iredmail.0.9.0-0.9.1.html | 177 +++++++++++++++++---- upgrade/0-upgrade.iredmail.0.9.0-0.9.1.md | 181 +++++++++++++++++++--- 5 files changed, 319 insertions(+), 58 deletions(-) diff --git a/TODO.md b/TODO.md index ef4833c8..7ca62842 100644 --- a/TODO.md +++ b/TODO.md @@ -1,5 +1,7 @@ # TODO +https://bitbucket.org/zhb/iredmail/commits/b721a9c376f67a4a11b4b1761386a266cfd11f96 + * How to install and configure SOGo groupware * How to install and configure Nginx * How to custom SpamAssassin scores diff --git a/convert.sh b/convert.sh index bf844d0d..e4faab6f 100644 --- a/convert.sh +++ b/convert.sh @@ -49,6 +49,11 @@ all_chapter_dirs="installation \ # - summary: _summary.md echo "We're migrating [old wiki documents](http://www.iredmail.org/wiki) to Markdown format for easier maintenance, all documents are available [here](https://bitbucket.org/zhb/docs.iredmail.org/src)." > ${INDEX_MD} +# Compile all Markdown files. +if echo "$@" | grep -q -- '--all' &>/dev/null; then + compile_all='YES' +fi + article_counter=0 echo -n "* Processing Markdown files: " @@ -106,15 +111,10 @@ for chapter_dir in ${all_chapter_dirs}; do fi # Convert modified file - if echo ${CHANGED_FILES} | grep ${article_file} > /dev/null; then - compile_this_file='YES' - fi + echo ${CHANGED_FILES} | grep ${article_file} &> /dev/null + compile_this_file="$?" - if echo "$@" | grep -q -- '--all'; then - compile_all='YES' - fi - - if [ X"${compile_this_file}" == X'YES' -o X"${compile_all}" == X'YES' ]; then + if [ X"${compile_this_file}" == X'0' -o X"${compile_all}" == X'YES' ]; then echo -e "\n* Converting: ${article_file}" ${CMD_CONVERT} ${article_file} ${OUTPUT_DIR} \ output_filename="${article_html_file}" \ diff --git a/html/css/markdown.css b/html/css/markdown.css index 5adfa111..6149ecb7 100644 --- a/html/css/markdown.css +++ b/html/css/markdown.css @@ -57,6 +57,7 @@ code { line-height: 1.5; font-size: 13px; } +h3 code { font-size: 18px; } aside { display: block; float: right; 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 844eb388..19abb207 100644 --- a/html/upgrade.iredmail.0.9.0-0.9.1.html +++ b/html/upgrade.iredmail.0.9.0-0.9.1.html @@ -26,18 +26,22 @@
  • OpenLDAP backend special
  • MySQL/MariaDB backend special
  • PostgreSQL backend special @@ -49,6 +53,9 @@

    WARNING: Still working in progress, do NOT apply it.

    ChangeLog