OP#785 add excludepaths and option to use it
This commit is contained in:
2
.vscode/settings.json
vendored
2
.vscode/settings.json
vendored
@@ -14,11 +14,13 @@
|
|||||||
"Dazuko",
|
"Dazuko",
|
||||||
"dbname",
|
"dbname",
|
||||||
"epel",
|
"epel",
|
||||||
|
"excludepaths",
|
||||||
"fanotify",
|
"fanotify",
|
||||||
"filesize",
|
"filesize",
|
||||||
"freshclam",
|
"freshclam",
|
||||||
"getsebool",
|
"getsebool",
|
||||||
"INADDR",
|
"INADDR",
|
||||||
|
"kubelet",
|
||||||
"libclamav",
|
"libclamav",
|
||||||
"logclean",
|
"logclean",
|
||||||
"logfacility",
|
"logfacility",
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ class confdroid_clamav::main::install (
|
|||||||
) inherits confdroid_clamav::params {
|
) inherits confdroid_clamav::params {
|
||||||
require confdroid_resources::main::epel
|
require confdroid_resources::main::epel
|
||||||
|
|
||||||
package { $reqpackages:
|
package { $cv_reqpackages:
|
||||||
ensure => $pkg_ensure,
|
ensure => $cv_pkg_ensure,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,8 +3,8 @@
|
|||||||
# Author: 12ww1160 (12ww1160@confdroid.com)
|
# Author: 12ww1160 (12ww1160@confdroid.com)
|
||||||
# @summary Class holds all parameters for the confdroid_clamav module and is
|
# @summary Class holds all parameters for the confdroid_clamav module and is
|
||||||
# inherited by all classes except defines.
|
# inherited by all classes except defines.
|
||||||
# @param [Array] reqpackages List of packages to install.
|
# @param [Array] cv_reqpackages List of packages to install.
|
||||||
# @param [String] pkg_ensure
|
# @param [String] cv_pkg_ensure
|
||||||
# which [package type](https://confdroid.com/2017/05/puppet-type-package/)
|
# which [package type](https://confdroid.com/2017/05/puppet-type-package/)
|
||||||
# to choose, i.e. `latest` or `present`.
|
# to choose, i.e. `latest` or `present`.
|
||||||
# @param [String] cv_logfile where to log messages for the clamd service.
|
# @param [String] cv_logfile where to log messages for the clamd service.
|
||||||
@@ -35,12 +35,13 @@
|
|||||||
# @param [String] cv_alert_file location and name of the alert file
|
# @param [String] cv_alert_file location and name of the alert file
|
||||||
# @param [Boolean] cv_enable_freshclam whether to enable the freshclam service
|
# @param [Boolean] cv_enable_freshclam whether to enable the freshclam service
|
||||||
# @param [Boolean] cv_enable_clamd whether to enable the clamd service
|
# @param [Boolean] cv_enable_clamd whether to enable the clamd service
|
||||||
|
# @param [Boolean] cv_use_excludepaths whether to use advanced exclude paths
|
||||||
##############################################################################
|
##############################################################################
|
||||||
class confdroid_clamav::params (
|
class confdroid_clamav::params (
|
||||||
|
|
||||||
# installation
|
# installation
|
||||||
Array $reqpackages = ['clamav','clamd','s-nail'],
|
Array $cv_reqpackages = ['clamav','clamd','s-nail'],
|
||||||
String $pkg_ensure = 'present',
|
String $cv_pkg_ensure = 'present',
|
||||||
|
|
||||||
# clamd
|
# clamd
|
||||||
String $cv_logfile = '/var/log/clamd.scan',
|
String $cv_logfile = '/var/log/clamd.scan',
|
||||||
@@ -64,6 +65,7 @@ class confdroid_clamav::params (
|
|||||||
String $cv_alert_file = 'tmp/clamav-alert.txt',
|
String $cv_alert_file = 'tmp/clamav-alert.txt',
|
||||||
Boolean $cv_enable_freshclam = true,
|
Boolean $cv_enable_freshclam = true,
|
||||||
Boolean $cv_enable_clamd = true,
|
Boolean $cv_enable_clamd = true,
|
||||||
|
Boolean $cv_use_excludepaths = true
|
||||||
|
|
||||||
) {
|
) {
|
||||||
# service
|
# service
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ PreludeAnalyzerName ClamAV
|
|||||||
|
|
||||||
# Log additional information about the infected file, such as its
|
# Log additional information about the infected file, such as its
|
||||||
# size and hash, together with the virus name.
|
# size and hash, together with the virus name.
|
||||||
#ExtendedDetectionInfo yes
|
ExtendedDetectionInfo yes
|
||||||
|
|
||||||
# This option allows you to save a process identifier of the listening
|
# This option allows you to save a process identifier of the listening
|
||||||
# daemon (main thread).
|
# daemon (main thread).
|
||||||
@@ -132,6 +132,28 @@ PreludeAnalyzerName ClamAV
|
|||||||
#ExcludePath ^/proc/
|
#ExcludePath ^/proc/
|
||||||
#ExcludePath ^/sys/
|
#ExcludePath ^/sys/
|
||||||
|
|
||||||
|
<% if @cv_use_excludepaths %>
|
||||||
|
ExcludePath ^/proc
|
||||||
|
ExcludePath ^/sys
|
||||||
|
ExcludePath ^/dev
|
||||||
|
ExcludePath ^/run
|
||||||
|
ExcludePath ^/var/run
|
||||||
|
ExcludePath ^/var/tmp
|
||||||
|
ExcludePath ^/tmp
|
||||||
|
ExcludePath ^/var/lib/clamav
|
||||||
|
ExcludePath ^/var/log/clamav
|
||||||
|
ExcludePath ^/var/lib/docker
|
||||||
|
ExcludePath ^/var/lib/containerd
|
||||||
|
ExcludePath ^/var/lib/kubelet/pods
|
||||||
|
ExcludePath ^/var/lib/kubelet/plugins
|
||||||
|
ExcludePath ^/var/lib/kubelet/plugins_registry
|
||||||
|
ExcludePath ^/var/log/pods
|
||||||
|
ExcludePath ^/var/log/containers
|
||||||
|
ExcludePath ^/var/cache
|
||||||
|
ExcludePath ^/run/containerd
|
||||||
|
ExcludePath ^/run/docker
|
||||||
|
<% end %>
|
||||||
|
|
||||||
# Maximum depth directories are scanned at.
|
# Maximum depth directories are scanned at.
|
||||||
# Default: 15
|
# Default: 15
|
||||||
#MaxDirectoryRecursion 20
|
#MaxDirectoryRecursion 20
|
||||||
|
|||||||
Reference in New Issue
Block a user