From 3ad5bab82a0c35b6693547e3760529100ae92cf2 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sun, 8 Jun 2025 15:34:03 +0200 Subject: [PATCH] Recommit for updates in build 15 --- .../clamav_cd_3A_3Amain_3A_3Aconfig.html | 18 ++- .../clamav_cd_3A_3Amain_3A_3Afiles.html | 28 +++- doc/puppet_classes/clamav_cd_3A_3Aparams.html | 146 ++++++++++++++++-- 3 files changed, 180 insertions(+), 12 deletions(-) diff --git a/doc/puppet_classes/clamav_cd_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/clamav_cd_3A_3Amain_3A_3Aconfig.html index 8be44a4..fbb6680 100644 --- a/doc/puppet_classes/clamav_cd_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/clamav_cd_3A_3Amain_3A_3Aconfig.html @@ -113,7 +113,15 @@ clamav_cd. 15 16 17 -18 +18 +19 +20 +21 +22 +23 +24 +25 +26 
# File 'manifests/main/config.pp', line 7
@@ -129,6 +137,14 @@ class clamav_cd::main::config (
     unless  => '/usr/sbin/getsebool antivirus_can_scan_system | grep --quiet "on"',
     path    => ['/usr/sbin', '/bin'],
   }
+
+  # create a cron job to run a daily scan
+  cron { 'clamscan':
+    command => $cv_shell_script,
+    user    => $cv_cron_user,
+    hour    => $cv_cron_hour,
+    minute  => $cv_cron_minute,
+  }
 }
diff --git a/doc/puppet_classes/clamav_cd_3A_3Amain_3A_3Afiles.html b/doc/puppet_classes/clamav_cd_3A_3Amain_3A_3Afiles.html index bf1740d..f1e3c29 100644 --- a/doc/puppet_classes/clamav_cd_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/clamav_cd_3A_3Amain_3A_3Afiles.html @@ -145,7 +145,20 @@ 47 48 49 -50 +50 +51 +52 +53 +54 +55 +56 +57 +58 +59 +60 +61 +62 +63 
# File 'manifests/main/files.pp', line 6
@@ -194,6 +207,19 @@ class clamav_cd::main::files (
     seluser  => system_u,
     content  => template($cv_freshclam_svc_erb),
   }
+
+  # shell script for scanning and alerting
+  file { $cv_shell_script  :
+    ensure   => file,
+    owner    => 'root',
+    group    => 'root',
+    mode     => '0750',
+    selrange => s0,
+    selrole  => object_r,
+    seltype  => etc_t,
+    seluser  => system_u,
+    content  => template($cv_shell_script_erb),
+  }
 }
diff --git a/doc/puppet_classes/clamav_cd_3A_3Aparams.html b/doc/puppet_classes/clamav_cd_3A_3Aparams.html index c0f44a7..c44ba33 100644 --- a/doc/puppet_classes/clamav_cd_3A_3Aparams.html +++ b/doc/puppet_classes/clamav_cd_3A_3Aparams.html @@ -115,7 +115,7 @@ inherited by all classes except defines. (Array) - (defaults to: ['clamav','clamd']) + (defaults to: ['clamav','clamd','s-nail']) — @@ -373,6 +373,114 @@ inherited by all classes except defines. —

ip address to listen on

+
+ + + +
  • + + cv_alert_email + + + (String) + + + (defaults to: 'you@example.com') + + + — +
    +

    email address to send alerts

    +
    + +
    • + +
  • + + cv_cron_hour + + + (String) + + + (defaults to: '2') + + + — +
    +

    which hour the scan should start

    +
    + +
    • + +
  • + + cv_cron_minute + + + (String) + + + (defaults to: '0') + + + — +
    +

    which minute the scan should start

    +
    + +
    • + +
  • + + cv_cron_user + + + (String) + + + (defaults to: 'root') + + + — +
    +

    which user should run the cron job

    +
    + +
    • + +
  • + + cv_scan_dir + + + (String) + + + (defaults to: '/') + + + — +
    +

    which directory should be scanned

    +
    + +
    • + +
  • + + cv_alert_file + + + (String) + + + (defaults to: 'tmp/clamav-alert.txt') + + + — +
    +

    location and name of the alert file

    • @@ -388,12 +496,6 @@ inherited by all classes except defines. 
     
 
-31
-32
-33
-34
-35
-36
 37
 38
 39
@@ -428,15 +530,30 @@ inherited by all classes except defines.
 68
 69
 70
-71
    +71 +72 +73 +74 +75 +76 +77 +78 +79 +80 +81 +82 +83 +84 +85 +86 - 
    # File 'manifests/params.pp', line 31
+        
    # File 'manifests/params.pp', line 37
 
 class clamav_cd::params (
 
 # installation
-  Array $reqpackages              = ['clamav','clamd'],
+  Array $reqpackages              = ['clamav','clamd','s-nail'],
   String $pkg_ensure              = 'present',
 
 # clamd
@@ -453,6 +570,13 @@ class clamav_cd::params (
   String $cv_preludeanalyzername  = 'ClamAV',
   String $cv_tcpsocket            = '3310',
   String $cv_tcpaddress           = 'localhost',
+  String $cv_alert_email          = 'you@example.com',
+  String $cv_cron_hour            = '2',
+  String $cv_cron_minute          = '0',
+  String $cv_cron_user            = 'root',
+  String $cv_scan_dir             = '/',
+  String $cv_alert_file           = 'tmp/clamav-alert.txt',
+
 
 ) {
   # service
@@ -469,6 +593,8 @@ class clamav_cd::params (
   $cv_freshclam_erb       = 'clamav_cd/freshclam_conf.erb'
   $cv_freshclam_svc       = '/usr/lib/systemd/system/freshclam.service'
   $cv_freshclam_svc_erb   = 'clamav_cd/freshclam_svc.erb'
+  $cv_shell_script        = "${cv_config_d_dir}/scan.sh"
+  $cv_shell_script_erb    = 'clamav_cd/scan.sh.erb'
 
   # includes must be last