From cf85f178827c762dc1d40b1892bdb4463128a027 Mon Sep 17 00:00:00 2001 From: kulikov-a <36099472+kulikov-a@users.noreply.github.com> Date: Fri, 2 Dec 2022 23:17:30 +0300 Subject: [PATCH] migrate to syslog-ng (#3208) --- security/clamav/Makefile | 3 +-- security/clamav/pkg-descr | 5 +++++ .../mvc/app/controllers/OPNsense/ClamAV/forms/general.xml | 8 +++++++- .../opnsense/mvc/app/models/OPNsense/ClamAV/ACL/ACL.xml | 6 ++---- .../opnsense/mvc/app/models/OPNsense/ClamAV/General.xml | 4 ++++ .../opnsense/mvc/app/models/OPNsense/ClamAV/Menu/Menu.xml | 3 +-- .../opnsense/service/templates/OPNsense/ClamAV/clamd.conf | 5 ++++- .../service/templates/OPNsense/ClamAV/freshclam.conf | 2 +- .../service/templates/OPNsense/Syslog/local/clamd.conf | 6 ++++++ 9 files changed, 31 insertions(+), 11 deletions(-) create mode 100644 security/clamav/src/opnsense/service/templates/OPNsense/Syslog/local/clamd.conf diff --git a/security/clamav/Makefile b/security/clamav/Makefile index 6daca4461..9b5f206a3 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -1,6 +1,5 @@ PLUGIN_NAME= clamav -PLUGIN_VERSION= 1.7 -PLUGIN_REVISION= 2 +PLUGIN_VERSION= 1.8 PLUGIN_COMMENT= Antivirus engine for detecting malicious threats PLUGIN_DEPENDS= clamav PLUGIN_MAINTAINER= m.muenz@gmail.com diff --git a/security/clamav/pkg-descr b/security/clamav/pkg-descr index e5066efc4..a601c42b3 100644 --- a/security/clamav/pkg-descr +++ b/security/clamav/pkg-descr @@ -9,6 +9,11 @@ database updates. Plugin Changelog ================ +1.8 + +* Use syslog for logging +* ClamAV verbose logging option added + 1.7 * Allow addition of external signatures diff --git a/security/clamav/src/opnsense/mvc/app/controllers/OPNsense/ClamAV/forms/general.xml b/security/clamav/src/opnsense/mvc/app/controllers/OPNsense/ClamAV/forms/general.xml index 8f40db9bd..0bc9d75bb 100644 --- a/security/clamav/src/opnsense/mvc/app/controllers/OPNsense/ClamAV/forms/general.xml +++ b/security/clamav/src/opnsense/mvc/app/controllers/OPNsense/ClamAV/forms/general.xml @@ -159,11 +159,17 @@ text Number of files to be scanned within an archive, a document, or any other container file. + + general.logverbose + + checkbox + Enable ClamAV verbose logging. + general.fc_logverbose checkbox - Enable verbose logging. + Enable Freshclam verbose logging. general.fc_databasemirror diff --git a/security/clamav/src/opnsense/mvc/app/models/OPNsense/ClamAV/ACL/ACL.xml b/security/clamav/src/opnsense/mvc/app/models/OPNsense/ClamAV/ACL/ACL.xml index 3ef9a8358..3299876ae 100644 --- a/security/clamav/src/opnsense/mvc/app/models/OPNsense/ClamAV/ACL/ACL.xml +++ b/security/clamav/src/opnsense/mvc/app/models/OPNsense/ClamAV/ACL/ACL.xml @@ -4,10 +4,8 @@ ui/clamav/* api/clamav/* - ui/diagnostics/log/clamav/clamd/* - api/diagnostics/log/clamav/clamd/* - ui/diagnostics/log/clamav/freshclam/* - api/diagnostics/log/clamav/freshclam/* + ui/diagnostics/log/core/clamd/* + api/diagnostics/log/core/clamd/* diff --git a/security/clamav/src/opnsense/mvc/app/models/OPNsense/ClamAV/General.xml b/security/clamav/src/opnsense/mvc/app/models/OPNsense/ClamAV/General.xml index c3594eb8e..4765e7b79 100644 --- a/security/clamav/src/opnsense/mvc/app/models/OPNsense/ClamAV/General.xml +++ b/security/clamav/src/opnsense/mvc/app/models/OPNsense/ClamAV/General.xml @@ -111,6 +111,10 @@ 10000 N + + 0 + N + 0 N diff --git a/security/clamav/src/opnsense/mvc/app/models/OPNsense/ClamAV/Menu/Menu.xml b/security/clamav/src/opnsense/mvc/app/models/OPNsense/ClamAV/Menu/Menu.xml index e10858f13..a66268fb6 100644 --- a/security/clamav/src/opnsense/mvc/app/models/OPNsense/ClamAV/Menu/Menu.xml +++ b/security/clamav/src/opnsense/mvc/app/models/OPNsense/ClamAV/Menu/Menu.xml @@ -2,8 +2,7 @@ - - + diff --git a/security/clamav/src/opnsense/service/templates/OPNsense/ClamAV/clamd.conf b/security/clamav/src/opnsense/service/templates/OPNsense/ClamAV/clamd.conf index 8d97d2bc7..88778b060 100644 --- a/security/clamav/src/opnsense/service/templates/OPNsense/ClamAV/clamd.conf +++ b/security/clamav/src/opnsense/service/templates/OPNsense/ClamAV/clamd.conf @@ -1,6 +1,9 @@ {% if helpers.exists('OPNsense.clamav.general.enabled') and OPNsense.clamav.general.enabled == '1' %} -LogFile /var/log/clamav/clamd.log LogTime yes +LogSyslog yes +{% if helpers.exists('OPNsense.clamav.general.logverbose') and OPNsense.clamav.general.logverbose == '1' %} +LogVerbose yes +{% endif %} PidFile /var/run/clamav/clamd.pid DatabaseDirectory /var/db/clamav LocalSocket /var/run/clamav/clamd.sock diff --git a/security/clamav/src/opnsense/service/templates/OPNsense/ClamAV/freshclam.conf b/security/clamav/src/opnsense/service/templates/OPNsense/ClamAV/freshclam.conf index b2720128d..3bfd536c3 100644 --- a/security/clamav/src/opnsense/service/templates/OPNsense/ClamAV/freshclam.conf +++ b/security/clamav/src/opnsense/service/templates/OPNsense/ClamAV/freshclam.conf @@ -2,7 +2,7 @@ DatabaseDirectory /var/db/clamav -UpdateLogFile /var/log/clamav/freshclam.log +LogSyslog yes LogTime yes {% if helpers.exists('OPNsense.clamav.general.fc_logverbose') and OPNsense.clamav.general.fc_logverbose == '1' %} diff --git a/security/clamav/src/opnsense/service/templates/OPNsense/Syslog/local/clamd.conf b/security/clamav/src/opnsense/service/templates/OPNsense/Syslog/local/clamd.conf new file mode 100644 index 000000000..048381b2c --- /dev/null +++ b/security/clamav/src/opnsense/service/templates/OPNsense/Syslog/local/clamd.conf @@ -0,0 +1,6 @@ +################################################################### +# Local syslog-ng configuration filter definition [clamd]. +################################################################### +filter f_local_clamd { + program("clamd") or program("freshclam"); +};