From 45623d0aec655f06173b7dc09db8f0e3263f930a Mon Sep 17 00:00:00 2001 From: Zhang Huangbin Date: Mon, 25 Jul 2016 11:35:57 +0800 Subject: [PATCH] Fix typos. --- ...onitor.incoming.and.outgoing.mails.with.bcc.md | 12 ++++++++++++ en_US/upgrade/0-upgrade.iredmail.0.9.2-0.9.3.md | 2 +- en_US/upgrade/0-upgrade.iredmail.0.9.5-0.9.5-1.md | 15 +++++---------- ...itor.incoming.and.outgoing.mails.with.bcc.html | 9 +++++++++ html/upgrade.iredmail.0.9.2-0.9.3.html | 2 +- html/upgrade.iredmail.0.9.5-0.9.5-1.html | 15 +++++---------- 6 files changed, 33 insertions(+), 22 deletions(-) diff --git a/en_US/howto/monitor.incoming.and.outgoing.mails.with.bcc.md b/en_US/howto/monitor.incoming.and.outgoing.mails.with.bcc.md index 95255004..84a4a0b9 100644 --- a/en_US/howto/monitor.incoming.and.outgoing.mails.with.bcc.md +++ b/en_US/howto/monitor.incoming.and.outgoing.mails.with.bcc.md @@ -81,6 +81,18 @@ enabledService=recipientbcc userRecipientBccAddress=inbound@example.com ``` +## Monitor all inbound and outbound + +To monitor all inbound and outbound on the server, please specify the email +address used to receive BCCed email in Postfix parameter `always_bcc`. For +example: + +``` +always_bcc = user@domain.com +``` + +Then all inbound and outbound will be BCCed to `user@domain.com`. + ## Screenshot of iRedAdmin-Pro Per-domain bcc settings: diff --git a/en_US/upgrade/0-upgrade.iredmail.0.9.2-0.9.3.md b/en_US/upgrade/0-upgrade.iredmail.0.9.2-0.9.3.md index ad8c0087..b22c0963 100644 --- a/en_US/upgrade/0-upgrade.iredmail.0.9.2-0.9.3.md +++ b/en_US/upgrade/0-upgrade.iredmail.0.9.2-0.9.3.md @@ -959,7 +959,7 @@ Please switch to PostgreSQL daemon user, then execute SQL commands to import it: # su - postgres $ psql -d amavisd sql> CREATE TABLE outbound_wblist (rid integer NOT NULL CHECK (rid >= 0), sid integer NOT NULL CHECK (sid >= 0), wb varchar(10) NOT NULL, PRIMARY KEY (rid,sid)); -sql> ALTER TABLE outbound_wblist OWNER TO 'amavisd'; +sql> ALTER TABLE outbound_wblist OWNER TO amavisd; ``` After table created, please restart iRedAPD service. diff --git a/en_US/upgrade/0-upgrade.iredmail.0.9.5-0.9.5-1.md b/en_US/upgrade/0-upgrade.iredmail.0.9.5-0.9.5-1.md index e1eaa1fe..116fd6bc 100644 --- a/en_US/upgrade/0-upgrade.iredmail.0.9.5-0.9.5-1.md +++ b/en_US/upgrade/0-upgrade.iredmail.0.9.5-0.9.5-1.md @@ -57,18 +57,13 @@ Restarting or reloading Postfix service is required. iRedMail-0.9.5 sets incorrect command for parameter `compresscmd` and `uncompresscmd`, please fix it with commands below: -* On RHEL/CentOS: +* On RHEL/CentOS/Debian/Ubuntu: ``` -perl -pi -e 's#\$\(which bzip2\)#/bin/bzip2#g' /etc/logrotate.d/* -perl -pi -e 's#\$\(which bunzip2\)#/bin/bunzip2#g' /etc/logrotate.d/* -``` - -* On Debian/Ubuntu: - -``` -perl -pi -e 's#\$\(which bzip2\)#/bin/bzip2#g' /etc/logrotate.d/* -perl -pi -e 's#\$\(which bunzip2\)#/bin/bunzip2#g' /etc/logrotate.d/* +export _Z="$(which bzip2)" +export _UZ="$(which bunzip2)" +perl -pi -e 's# /bin/bzip2#$ENV{_Z}#g' /etc/logrotate.d/* +perl -pi -e 's# /bin/bunzip2#$ENV{_UZ}#g' /etc/logrotate.d/* ``` * On FreeBSD, OpenBSD: no fix required since FreeBSD/OpenBSD rotates log files diff --git a/html/monitor.incoming.and.outgoing.mails.with.bcc.html b/html/monitor.incoming.and.outgoing.mails.with.bcc.html index eb69e525..d5443481 100644 --- a/html/monitor.incoming.and.outgoing.mails.with.bcc.html +++ b/html/monitor.incoming.and.outgoing.mails.with.bcc.html @@ -22,6 +22,7 @@
  • Manage BCC settings with iRedAdmin-Pro
  • SQL: Manage BCC settings with SQL command line tools
  • LDAP: Manage BCC settings with phpLDAPadmin or other LDAP client tools
    • +
  • Monitor all inbound and outbound
  • Screenshot of iRedAdmin-Pro
    • @@ -104,6 +105,14 @@ enabledService=recipientbcc userRecipientBccAddress=inbound@example.com +

    Monitor all inbound and outbound

    +

    To monitor all inbound and outbound on the server, please specify the email +address used to receive BCCed email in Postfix parameter always_bcc. For +example:

    +
    always_bcc = user@domain.com
+
    + +

    Then all inbound and outbound will be BCCed to user@domain.com.

    Screenshot of iRedAdmin-Pro

    Per-domain bcc settings:

    diff --git a/html/upgrade.iredmail.0.9.2-0.9.3.html b/html/upgrade.iredmail.0.9.2-0.9.3.html index 725de7eb..f81efddc 100644 --- a/html/upgrade.iredmail.0.9.2-0.9.3.html +++ b/html/upgrade.iredmail.0.9.2-0.9.3.html @@ -901,7 +901,7 @@ to store white/blacklists for outbound message, required by iRedAPD plugin 
    # su - postgres
 $ psql -d amavisd
 sql> CREATE TABLE outbound_wblist (rid integer NOT NULL CHECK (rid >= 0), sid integer NOT NULL CHECK (sid >= 0), wb varchar(10) NOT NULL, PRIMARY KEY (rid,sid));
-sql> ALTER TABLE outbound_wblist OWNER TO 'amavisd';
+sql> ALTER TABLE outbound_wblist OWNER TO amavisd;

    After table created, please restart iRedAPD service.

    diff --git a/html/upgrade.iredmail.0.9.5-0.9.5-1.html b/html/upgrade.iredmail.0.9.5-0.9.5-1.html index 9817f087..1b1496e2 100644 --- a/html/upgrade.iredmail.0.9.5-0.9.5-1.html +++ b/html/upgrade.iredmail.0.9.5-0.9.5-1.html @@ -77,17 +77,12 @@ iRedMail-0.9.4 or earlier release, it's safe to ignore this step.

    iRedMail-0.9.5 sets incorrect command for parameter compresscmd and uncompresscmd, please fix it with commands below:

    -
    perl -pi -e 's#\$\(which bzip2\)#/bin/bzip2#g' /etc/logrotate.d/*
-perl -pi -e 's#\$\(which bunzip2\)#/bin/bunzip2#g' /etc/logrotate.d/*
-
    - - -
    perl -pi -e 's#\$\(which bzip2\)#/bin/bzip2#g' /etc/logrotate.d/*
-perl -pi -e 's#\$\(which bunzip2\)#/bin/bunzip2#g' /etc/logrotate.d/*
+
    export _Z="$(which bzip2)"
+export _UZ="$(which bunzip2)"
+perl -pi -e 's# /bin/bzip2#$ENV{_Z}#g' /etc/logrotate.d/*
+perl -pi -e 's# /bin/bunzip2#$ENV{_UZ}#g' /etc/logrotate.d/*