From fe2addd09c0ab24939b7f8d69038318dda3c4373 Mon Sep 17 00:00:00 2001
From: Zhang Huangbin
Date: Wed, 9 Sep 2020 22:54:14 +0800
Subject: [PATCH] [OPTIONAL] Amavisd: Log matched virus database name. fixes
iredmail/iRedMail#82
---
.../upgrade/0-upgrade.iredmail.1.3.1-1.3.2.md | 31 +++++++++++++++++
html/upgrade.iredmail.1.3.1-1.3.2.html | 34 ++++++++++++++++++-
2 files changed, 64 insertions(+), 1 deletion(-)
diff --git a/en_US/upgrade/0-upgrade.iredmail.1.3.1-1.3.2.md b/en_US/upgrade/0-upgrade.iredmail.1.3.1-1.3.2.md
index 407846e5..5330e9aa 100644
--- a/en_US/upgrade/0-upgrade.iredmail.1.3.1-1.3.2.md
+++ b/en_US/upgrade/0-upgrade.iredmail.1.3.1-1.3.2.md
@@ -81,3 +81,34 @@ user or `amavisd` user, then run SQL commands below to fix it:
USE amavisd;
ALTER TABLE msgs MODIFY COLUMN from_address VARBINARY(255) NOT NULL DEFAULT '';
```
+
+### [OPTIONAL] Amavisd: Log matched virus database name
+
+Please update parameter `@av_scanner` in Amavisd config file as described
+below, so that Amavisd logs matched virus database name.
+ - On RHEL/CentOS, it's `/etc/amavisd/amavisd.conf`
+ - On Debian/Ubuntu, it's `/etc/amavis/conf.d/50-user`
+ - On FreeBSD, it's `/usr/local/etc/amavisd.conf`
+ - On OpenBSD, it's `/etc/amavisd.conf`
+
+- Find parameter `@av_scanner` like below:
+
+```
+@av_scanners = (
+ ...
+ qr/\bOK$/, qr/\bFOUND$/,
+ qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
+);
+```
+
+- Please append character `m` after `OK$/` and `FOUND$/` like below:
+
+```
+@av_scanners = (
+ ...
+ qr/\bOK$/m, qr/\bFOUND$/m,
+ qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
+);
+```
+
+- Restarting Amavisd service is required.
diff --git a/html/upgrade.iredmail.1.3.1-1.3.2.html b/html/upgrade.iredmail.1.3.1-1.3.2.html
index ba59906e..f0b56941 100644
--- a/html/upgrade.iredmail.1.3.1-1.3.2.html
+++ b/html/upgrade.iredmail.1.3.1-1.3.2.html
@@ -27,6 +27,7 @@
Upgrade netdata to the latest stable release (1.23.2)
Fixed: update Fail2ban filter rules to match new error log produced by latest Roundcube
Fixed: can not store mail sender address with utf8 characters in amavisd database
+[OPTIONAL] Amavisd: Log matched virus database name
@@ -94,7 +95,38 @@ doesn't support emoji characters. Please login to MySQL/MariaDB server as
user or amavisd
user, then run SQL commands below to fix it:
USE amavisd;
ALTER TABLE msgs MODIFY COLUMN from_address VARBINARY(255) NOT NULL DEFAULT '';
-