diff --git a/TODO.md b/TODO.md index 6aa4eb43..bb043a53 100644 --- a/TODO.md +++ b/TODO.md @@ -1,5 +1,7 @@ # TODO +* `convert.sh`: Indicate document is available in other language in article page. + * http://doc.samplezone.ch/iredmail/version-0-9-1/programs/program-sockets/ * http://doc.samplezone.ch/iredmail/ diff --git a/en_US/howto/0-performance.tuning.md b/en_US/howto/0-performance.tuning.md index 126ee3c3..1e8b04d2 100644 --- a/en_US/howto/0-performance.tuning.md +++ b/en_US/howto/0-performance.tuning.md @@ -19,9 +19,12 @@ a cache DNS server in LAN or localhost helps a lot: * [Enable postscreen service](./enable.postscreen.html) If you don't want to use postscreen service, you can [enable DNSBL service](./enable.dnsbl.html) -instead, it helps a lot too, but less effective than postscreen service. +instead, it helps a lot too. Although both `postscreen` and pure DNSBL services +uses the same DNSBL servers, but `postscreen` offers additional solutions to +reduce spam, so postscreen is better. -postscreen and DNSBL service help catch a lot spam, save much system resource. +postscreen and DNSBL service help catch a lot spam before putting the spams +in local mail queue, so they save much system resource. ### Update Amavisd + Postfix config files to process more emails concurrently diff --git a/en_US/howto/ignore.trash.folder.in.quota.md b/en_US/howto/ignore.trash.folder.in.quota.md index 46fc592d..bf834569 100644 --- a/en_US/howto/ignore.trash.folder.in.quota.md +++ b/en_US/howto/ignore.trash.folder.in.quota.md @@ -4,9 +4,8 @@ Per-user mailbox quota rule is defined in Dovecot, in one of below files: * `/etc/dovecot/dovecot-mysql.conf`: MySQL backend * `/etc/dovecot/dovecot-pgsql.conf`: PostgreSQL backend -* `/etc/dovecot/dovecot-mysql.conf`: MySQL backend -If no per-user quota rules found, Dovecot will use 'quota_rule[X]' defined in +If no per-user quota rules found, Dovecot will use `quota_rule[X]` defined in `/etc/dovecot/dovecot.conf`. For example: ``` @@ -36,7 +35,7 @@ plugin { quota = dict:user::proxy::quotadict quota_rule = *:storage=1G - quota_rule2 = Trash:ignore + quota_rule2 = Trash:ignore # <-- new quota rule, ignore Trash folder ... } @@ -51,6 +50,6 @@ user_attrs = ...,mailQuota=quota_rule=*:bytes=%$,=quota_rule2=Trash:ignore # File: /etc/dovecot/dovecot-mysql.conf, or dovecot-pgsql.conf user_query = SELECT ... \ CONCAT('*:bytes=', mailbox.quota*1048576) AS quota_rule \ - 'Trash:ignore' AS quota_rule2 \ + 'Trash:ignore' AS quota_rule2 \ -- New quota rule, ignore Trash folder FROM ... ``` diff --git a/en_US/howto/use.a.bought.ssl.certificate.md b/en_US/howto/use.a.bought.ssl.certificate.md index 4448a25c..c9114175 100644 --- a/en_US/howto/use.a.bought.ssl.certificate.md +++ b/en_US/howto/use.a.bought.ssl.certificate.md @@ -45,7 +45,7 @@ certificate: * `A challenge password []`: type a password for this ssl certificate. * `An optional company name []`: an optional company name. -NOTE: Some certificates can only be used on web servers using the `Common Name` +__NOTE__: Some certificates can only be used on web servers using the `Common Name` specified during enrollment. For example, a certificate for the domain `domain.com` will receive a warning if accessing a site named `www.domain.com` or `secure.domain.com`, because `www.domain.com` and `secure.domain.com` are @@ -72,7 +72,7 @@ store them in any directory you like, recommended directories are: ## Configure Postfix/Dovecot/Apache/Nginx to use bought SSL certificate We use CentOS for example in below tutorial, please adjust the file to correct -one on your server. +one on your server according to above description. ### Postfix (SMTP server) diff --git a/html/ignore.trash.folder.in.quota.html b/html/ignore.trash.folder.in.quota.html index b8d17741..a0c3bb22 100644 --- a/html/ignore.trash.folder.in.quota.html +++ b/html/ignore.trash.folder.in.quota.html @@ -15,9 +15,8 @@ -

If no per-user quota rules found, Dovecot will use 'quota_rule[X]' defined in +

If no per-user quota rules found, Dovecot will use quota_rule[X] defined in /etc/dovecot/dovecot.conf. For example:

# File: /etc/dovecot/dovecot.conf
 
@@ -44,7 +43,7 @@ plugin {
 
     quota = dict:user::proxy::quotadict
     quota_rule = *:storage=1G
-    quota_rule2 = Trash:ignore
+    quota_rule2 = Trash:ignore      # <-- new quota rule, ignore Trash folder
 
     ...
 }
@@ -59,7 +58,7 @@ user_attrs      = ...,mailQuota=quota_rule=*:bytes=%$,=quota_rule2=Trash:ignore
 # File: /etc/dovecot/dovecot-mysql.conf, or dovecot-pgsql.conf
 user_query = SELECT ... \
                    CONCAT('*:bytes=', mailbox.quota*1048576) AS quota_rule \
-                   'Trash:ignore' AS quota_rule2 \
+                   'Trash:ignore' AS quota_rule2 \      -- New quota rule, ignore Trash folder
                    FROM ...

Document published under a CC BY-ND 3.0 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/ignore.trash.folder.in.quota.html b/html/zh_CN/ignore.trash.folder.in.quota.html new file mode 100644 index 00000000..fa6501df --- /dev/null +++ b/html/zh_CN/ignore.trash.folder.in.quota.html @@ -0,0 +1,76 @@ + + + + 在邮箱配额中忽略垃圾箱目录 + + + + +

在邮箱配额中忽略垃圾箱目录

+

在 Dovecot 中，针对单个用户的邮箱配额限制定义在下列文件之一：

+ +

如果没有针对单个用户的邮箱配额限制，Dovecot 将使用 /etc/dovecot/dovecot.conf +文件中的 quota_rule[X] 设置。例如：

+
# File: /etc/dovecot/dovecot.conf
+
+plugin {                                                                        
+
+    quota = dict:user::proxy::quotadict
+    quota_rule = *:storage=1G
+    #quota_rule2 = *:messages=0
+    #quota_rule3 = Trash:storage=1G
+    #quota_rule4 = Junk:ignore
+
+    ...
+}
+
+ +

因此，要忽略 Trash 目录的邮箱容量，可以在 /etc/dovecot/dovecot.conf 或 +/etc/dovecot/dovecot-{mysql,pgsql,ldap}.conf 中增加新的配额规则（quota_rule）。

+ +
# File: /etc/dovecot/dovecot.conf
+
+plugin {                                                                        
+
+    quota = dict:user::proxy::quotadict
+    quota_rule = *:storage=1G
+    quota_rule2 = Trash:ignore      # <- 新配额规则：忽略 Trash 目录
+
+    ...
+}
+
+ + +

OpenLDAP 后端：

+
# File: /etc/dovecot/dovecot-ldap.conf
+
+user_attrs      = ...,mailQuota=quota_rule=*:bytes=%$,=quota_rule2=Trash:ignore
+
+ +

MySQL 或 PostgreSQL 后端：

+

File: /etc/dovecot/dovecot-mysql.conf, or dovecot-pgsql.conf

+

user_query = SELECT ... \ + CONCAT(':bytes=', mailbox.quota1048576) AS quota_rule \ + 'Trash:ignore' AS quota_rule2 \ -- 新配额规则：忽略 Trash 目录 + FROM ... +```

Document published under a CC BY-ND 3.0 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/index.html b/html/zh_CN/index.html index fedfba27..48cdbb63 100644 --- a/html/zh_CN/index.html +++ b/html/zh_CN/index.html @@ -11,6 +11,9 @@

How to

排错与调试