From 234821e9210e832fecf10bcd69d3d7ec9ea3939a Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Tue, 22 Sep 2026 13:39:15 +0200 Subject: [PATCH] Recommit for updates in build 9 --- doc/file.README.html | 2 +- doc/index.html | 2 +- ...confdroid_clamav_3A_3Amain_3A_3Afiles.html | 34 ++++++++++++++++++- .../confdroid_clamav_3A_3Aparams.html | 21 ++++++++---- 4 files changed, 50 insertions(+), 9 deletions(-) diff --git a/doc/file.README.html b/doc/file.README.html index 532dad2..0e25580 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -107,7 +107,7 @@

  • run cron job to scan the file system (by default starting at root, configurable) via clamdscan

  • -

    set ConcurrentDatabaseReload option yes/no to optimize RAM consumption

    +

    set ConcurrentDatabaseReload option yes/no to optimize RAM consumption. defaults to no

  • manage services

    • diff --git a/doc/index.html b/doc/index.html index 414d029..4879aff 100644 --- a/doc/index.html +++ b/doc/index.html @@ -107,7 +107,7 @@

  • run cron job to scan the file system (by default starting at root, configurable) via clamdscan

  • -

    set ConcurrentDatabaseReload option yes/no to optimize RAM consumption

    +

    set ConcurrentDatabaseReload option yes/no to optimize RAM consumption. defaults to no

  • manage services

    • diff --git a/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Afiles.html b/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Afiles.html index 33b9294..4be93f9 100644 --- a/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Afiles.html @@ -158,7 +158,23 @@ 60 61 62 -63 +63 +64 +65 +66 +67 +68 +69 +70 +71 +72 +73 +74 +75 +76 +77 +78 +79 
    # File 'manifests/main/files.pp', line 6
@@ -193,6 +209,7 @@ class confdroid_clamav::main::files (
     seltype  => etc_t,
     seluser  => system_u,
     content  => template($cv_freshclam_erb),
+    notify   => Service[$cv_freshclam],
   }
 
   # freshclam service config file
@@ -206,6 +223,21 @@ class confdroid_clamav::main::files (
     seltype  => etc_t,
     seluser  => system_u,
     content  => template($cv_freshclam_svc_erb),
+    notify   => Service[$cv_freshclam],
+  }
+
+  # clamd service config file
+  file { $cv_clamd_svc  :
+    ensure   => file,
+    owner    => 'root',
+    group    => 'root',
+    mode     => '0600',
+    selrange => s0,
+    selrole  => object_r,
+    seltype  => etc_t,
+    seluser  => system_u,
+    content  => template($cv_clamd_svc_erb),
+    notify   => Service[$cv_service],
   }
 
   # shell script for scanning and alerting
diff --git a/doc/puppet_classes/confdroid_clamav_3A_3Aparams.html b/doc/puppet_classes/confdroid_clamav_3A_3Aparams.html
index d06b5b8..62df361 100644
--- a/doc/puppet_classes/confdroid_clamav_3A_3Aparams.html
+++ b/doc/puppet_classes/confdroid_clamav_3A_3Aparams.html
@@ -550,6 +550,11 @@ inherited by all classes except defines.
         (defaults to: 'no')
       
       
+        —
+        
    
+
    whether to enable concurrent database reloads. This is useful when you have multiple clamd instances running on the same machine. If you have only one clamd instance, this should be set to ‘no’.
    
+
    
+      
     
   
 
@@ -563,10 +568,6 @@ inherited by all classes except defines.
         
     
 
-40
-41
-42
-43
 44
 45
 46
@@ -615,10 +616,16 @@ inherited by all classes except defines.
 89
 90
 91
-92
    
+92
+93
+94
+95
+96
+97
+98
    - 
    # File 'manifests/params.pp', line 40
+        
    # File 'manifests/params.pp', line 44
 
 class confdroid_clamav::params (
 
@@ -666,6 +673,8 @@ class confdroid_clamav::params (
   $cv_freshclam_erb       = 'confdroid_clamav/freshclam_conf.erb'
   $cv_freshclam_svc       = '/usr/lib/systemd/system/freshclam.service'
   $cv_freshclam_svc_erb   = 'confdroid_clamav/freshclam_svc.erb'
+  $cv_clamd_svc           = '/usr/lib/systemd/system/clamd@.service'
+  $cv_clamd_svc_erb       = 'confdroid_clamav/clamd_svc.erb'
   $cv_shell_script        = "${cv_config_d_dir}/scan.sh"
   $cv_shell_script_erb    = 'confdroid_clamav/scan.sh.erb'