From 8cafb84e748a35e987f23cfbb7c9bd69169d1267 Mon Sep 17 00:00:00 2001 From: 12ww1160 <12ww1160@confdroid.com> Date: Mon, 14 Sep 2026 11:45:57 +0200 Subject: [PATCH 1/2] add option to disable clamscan --- .vscode/settings.json | 1 + manifests/main/service.pp | 38 ++++++++++++++++++++++++++++---------- manifests/params.pp | 5 ++++- 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index f888342..e8e4fe0 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -4,6 +4,7 @@ "authenticode", "behaviour", "bofh", + "clamav", "clamd", "clamonacc", "clamscan", diff --git a/manifests/main/service.pp b/manifests/main/service.pp index fefe0f9..22e3775 100644 --- a/manifests/main/service.pp +++ b/manifests/main/service.pp @@ -8,17 +8,35 @@ class clamav_cd::main::service ( ) inherits clamav_cd::params { require clamav_cd::main::files - service { $cv_service: - ensure => running, - hasstatus => true, - hasrestart => true, - enable => true, + if $cv_enable_clamd == true { + service { $cv_service: + ensure => running, + hasstatus => true, + hasrestart => true, + enable => true, + } + } else { + service { $cv_service: + ensure => stopped, + hasstatus => true, + hasrestart => true, + enable => false, + } } - service { $cv_freshclam: - ensure => running, - hasstatus => true, - hasrestart => true, - enable => true, + if $cv_enable_freshclam == true { + service { $cv_freshclam: + ensure => running, + hasstatus => true, + hasrestart => true, + enable => true, + } + } else { + service { $cv_freshclam: + ensure => stopped, + hasstatus => true, + hasrestart => true, + enable => false, + } } } diff --git a/manifests/params.pp b/manifests/params.pp index 96c8342..31f19a3 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -33,6 +33,8 @@ # @param [String] cv_cron_user which user should run the cron job # @param [String] cv_scan_dir which directory should be scanned # @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_clamd whether to enable the clamd service ############################################################################## class clamav_cd::params ( @@ -60,7 +62,8 @@ class clamav_cd::params ( String $cv_cron_user = 'root', String $cv_scan_dir = '/', String $cv_alert_file = 'tmp/clamav-alert.txt', - + Boolean $cv_enable_freshclam = true, + Boolean $cv_enable_clamd = true, ) { # service From ca1850223ce164fc0527f7a3d62afd8a498619f6 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Mon, 14 Sep 2026 11:51:17 +0200 Subject: [PATCH 2/2] Recommit for updates in build 18 --- .../clamav_cd_3A_3Amain_3A_3Aservice.html | 58 +++++++++++++++---- doc/puppet_classes/clamav_cd_3A_3Aparams.html | 48 +++++++++++++-- 2 files changed, 90 insertions(+), 16 deletions(-) diff --git a/doc/puppet_classes/clamav_cd_3A_3Amain_3A_3Aservice.html b/doc/puppet_classes/clamav_cd_3A_3Amain_3A_3Aservice.html index 4e58037..9c6088b 100644 --- a/doc/puppet_classes/clamav_cd_3A_3Amain_3A_3Aservice.html +++ b/doc/puppet_classes/clamav_cd_3A_3Amain_3A_3Aservice.html @@ -119,7 +119,25 @@ 21 22 23 -24 +24 +25 +26 +27 +28 +29 +30 +31 +32 +33 +34 +35 +36 +37 +38 +39 +40 +41 +42
# File 'manifests/main/service.pp', line 6
@@ -129,18 +147,36 @@ class clamav_cd::main::service (
 ) inherits clamav_cd::params {
   require clamav_cd::main::files
 
-  service { $cv_service:
-    ensure     => running,
-    hasstatus  => true,
-    hasrestart => true,
-    enable     => true,
+  if $cv_enable_clamd == true {
+    service { $cv_service:
+      ensure     => running,
+      hasstatus  => true,
+      hasrestart => true,
+      enable     => true,
+    }
+  } else {
+    service { $cv_service:
+      ensure     => stopped,
+      hasstatus  => true,
+      hasrestart => true,
+      enable     => false,
+    }
   }
 
-  service { $cv_freshclam:
-    ensure     => running,
-    hasstatus  => true,
-    hasrestart => true,
-    enable     => true,
+  if $cv_enable_freshclam == true {
+    service { $cv_freshclam:
+      ensure     => running,
+      hasstatus  => true,
+      hasrestart => true,
+      enable     => true,
+    }
+  } else {
+    service { $cv_freshclam:
+      ensure     => stopped,
+      hasstatus  => true,
+      hasrestart => true,
+      enable     => false,
+    }
   }
 }
diff --git a/doc/puppet_classes/clamav_cd_3A_3Aparams.html b/doc/puppet_classes/clamav_cd_3A_3Aparams.html index c44ba33..3218ecf 100644 --- a/doc/puppet_classes/clamav_cd_3A_3Aparams.html +++ b/doc/puppet_classes/clamav_cd_3A_3Aparams.html @@ -481,6 +481,42 @@ inherited by all classes except defines. —

location and name of the alert file

+
+ + + +
  • + + cv_enable_freshclam + + + (Boolean) + + + (defaults to: true) + + + — +
    +

    whether to enable the freshclam service

    +
    + +
  • + +
  • + + cv_enable_clamd + + + (Boolean) + + + (defaults to: true) + + + — +
    +

    whether to enable the clamd service

  • @@ -496,8 +532,6 @@ inherited by all classes except defines.
     
     
    -37
    -38
     39
     40
     41
    @@ -545,10 +579,13 @@ inherited by all classes except defines.
     83
     84
     85
    -86
    +86 +87 +88 +89 -
    # File 'manifests/params.pp', line 37
    +        
    # File 'manifests/params.pp', line 39
     
     class clamav_cd::params (
     
    @@ -576,7 +613,8 @@ class clamav_cd::params (
       String $cv_cron_user            = 'root',
       String $cv_scan_dir             = '/',
       String $cv_alert_file           = 'tmp/clamav-alert.txt',
    -
    +  Boolean $cv_enable_freshclam    = true,
    +  Boolean $cv_enable_clamd        = true,
     
     ) {
       # service