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 04d55690..fdbd0086 100644 --- a/en_US/installation/0-install.iredmail.on.debian.ubuntu.md +++ b/en_US/installation/0-install.iredmail.on.debian.ubuntu.md @@ -68,7 +68,7 @@ mx.example.com ### Enable default official Debian/Ubuntu apt repositories * iRedMail needs official Debian/Ubuntu apt repositories, please enable them in - `/etc/apt/sources.lists`. + `/etc/apt/sources.list`. * Install package `bzip2` so that you can uncompress downloaded iRedMail package. ``` diff --git a/en_US/upgrade/0-upgrade.iredmail.0.9.5.1-0.9.6.md b/en_US/upgrade/0-upgrade.iredmail.0.9.5.1-0.9.6.md index 76645318..067e0338 100644 --- a/en_US/upgrade/0-upgrade.iredmail.0.9.5.1-0.9.6.md +++ b/en_US/upgrade/0-upgrade.iredmail.0.9.5.1-0.9.6.md @@ -19,6 +19,7 @@ ## ChangeLog +* Jul 2, 2016: Fixed: SOGo-3.1.3 (and later releases) changed argument used by `sogo-tool` command * Jun 10, 2016: Fixed: Nginx doesn't forward real client IP address to SOGo. * Jun 8, 2016: Set correct file owner for config file of Roundcube password plugin. * Jun 8, 2016: Fixed: one incorrect HELO restriction rule in Postfix. @@ -151,3 +152,16 @@ steps below to fix it. ``` * Restart Nginx service. + +### Fixed: SOGo-3.1.3 (and later releases) changed argument used by `sogo-tool` command + +SOGo-3.1.3 (and late releases) changed `sogo-tool` argument `expire-autoreply` +to `update-autoreply`, and it's used in a daily cron job. Please update SOGo +cron job to fix it. + +* Edit SOGo deamon user's cron job with command. + * On Linux: ```crontab -e -u sogo``` + * On FreeBSD: ```crontab -e -u sogod``` + * On OpenBSD: ```crontab -e -u _sogo``` + +* Replace the argument `expire-autoreply` by `update-autoreply`. diff --git a/html/install.iredmail.on.debian.ubuntu-zh_CN.html b/html/install.iredmail.on.debian.ubuntu-zh_CN.html index 991b4f8b..937c9a05 100644 --- a/html/install.iredmail.on.debian.ubuntu-zh_CN.html +++ b/html/install.iredmail.on.debian.ubuntu-zh_CN.html @@ -88,7 +88,7 @@ mx.example.com
/etc/apt/sources.lists
+/etc/apt/sources.list
文件里启用它们。bzip2
程序用于解压缩文件:/etc/apt/sources.lists
./etc/apt/sources.list
.
bzip2
so that you can uncompress downloaded iRedMail package.# sudo apt-get install bzip2
diff --git a/html/upgrade.iredmail.0.9.5.1-0.9.6.html b/html/upgrade.iredmail.0.9.5.1-0.9.6.html
index 014681dd..1758d8aa 100644
--- a/html/upgrade.iredmail.0.9.5.1-0.9.6.html
+++ b/html/upgrade.iredmail.0.9.5.1-0.9.6.html
@@ -30,6 +30,7 @@
Fixed: one incorrect HELO restriction rule in Postfix
Fixed: incorrect file owner and permission of config file of Roundcube password plugin
Fixed: Nginx doesn't forward real client IP address to SOGo
+Fixed: SOGo-3.1.3 (and later releases) changed argument used by sogo-tool command
@@ -53,6 +54,7 @@ check the details and co
ChangeLog
+- Jul 2, 2016: Fixed: SOGo-3.1.3 (and later releases) changed argument used by
sogo-tool
command
- Jun 10, 2016: Fixed: Nginx doesn't forward real client IP address to SOGo.
- Jun 8, 2016: Set correct file owner for config file of Roundcube password plugin.
- Jun 8, 2016: Fixed: one incorrect HELO restriction rule in Postfix.
@@ -169,6 +171,23 @@ steps below to fix it.
- Restart Nginx service.
+
+Fixed: SOGo-3.1.3 (and later releases) changed argument used by sogo-tool
command
+SOGo-3.1.3 (and late releases) changed sogo-tool
argument expire-autoreply
+to update-autoreply
, and it's used in a daily cron job. Please update SOGo
+cron job to fix it.
+
+-
+
Edit SOGo deamon user's cron job with command.
+
+- On Linux:
crontab -e -u sogo
+- On FreeBSD:
crontab -e -u sogod
+- On OpenBSD:
crontab -e -u _sogo
+
+
+-
+
Replace the argument expire-autoreply
by update-autoreply
.
+
diff --git a/tools/markdown2html.py b/tools/markdown2html.py
index 685ff5d1..cbfd5cce 100644
--- a/tools/markdown2html.py
+++ b/tools/markdown2html.py
@@ -11,8 +11,12 @@ import commands
import web
import markdown
+# https://github.com/FND/markdown-checklist
+from markdown_checklist.extension import ChecklistExtension
+
# Markdown extensions
-MD_EXTENSIONS = ['toc', 'meta', 'extra', 'footnotes', 'admonition', 'tables', 'attr_list']
+MD_EXTENSIONS = ['toc', 'meta', 'extra', 'footnotes', 'admonition',
+ 'tables', 'attr_list', ChecklistExtension()]
# Get file name
filename = sys.argv[1]
@@ -31,7 +35,7 @@ for arg in args:
cmd_opts[var] = value
# Get article title
-if not 'title' in cmd_opts:
+if 'title' not in cmd_opts:
cmd_opts['title'] = commands.getoutput("""grep 'Title:' %s |awk -F'Title: ' '{print $2}'""" % filename)
cmd_opts['title'] = cmd_opts['title'].strip()
diff --git a/zh_CN/installation/0-install.iredmail.on.debian.ubuntu.md b/zh_CN/installation/0-install.iredmail.on.debian.ubuntu.md
index b2bb311d..42967002 100644
--- a/zh_CN/installation/0-install.iredmail.on.debian.ubuntu.md
+++ b/zh_CN/installation/0-install.iredmail.on.debian.ubuntu.md
@@ -58,7 +58,7 @@ mx.example.com
### 启用 Debian/Ubuntu 默认的官方 apt 软件源
-* iRedMail 依赖 Debian/Ubuntu 官方的 apt 软件源,请在 `/etc/apt/sources.lists`
+* iRedMail 依赖 Debian/Ubuntu 官方的 apt 软件源,请在 `/etc/apt/sources.list`
文件里启用它们。
* 安装 `bzip2` 程序用于解压缩文件: