From 019416cc6dd8c4d61cb9db8f38a208196d63ed87 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Sun, 8 Jun 2025 13:42:39 +0200 Subject: [PATCH 1/2] add spelling --- .vscode/settings.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index ae314a8..237f0a1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,8 +1,12 @@ { "cSpell.words": [ "clamd", + "clamscan", + "clamupdate", + "dbname", "epel", "freshclam", + "libclamav", "logclean", "logfacility", "logfile", @@ -12,7 +16,11 @@ "logsyslog", "logtime", "logverbose", + "mypass", + "myproxy", + "myusername", "preludeanalyzername", - "preludeenable" + "preludeenable", + "safebrowsing" ] } \ No newline at end of file From 96136178fcc75db832e90ec6019db5bd725f53c5 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sun, 8 Jun 2025 13:43:31 +0200 Subject: [PATCH 2/2] Recommit for updates in build 8 --- .../clamav_cd_3A_3Amain_3A_3Afiles.html | 30 +++++++++++++++++-- .../clamav_cd_3A_3Amain_3A_3Aservice.html | 28 ++++++++++++----- doc/puppet_classes/clamav_cd_3A_3Aparams.html | 20 ++++++++----- 3 files changed, 62 insertions(+), 16 deletions(-) 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 ca42a88..bf1740d 100644 --- a/doc/puppet_classes/clamav_cd_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/clamav_cd_3A_3Amain_3A_3Afiles.html @@ -132,7 +132,20 @@ 34 35 36 -37 +37 +38 +39 +40 +41 +42 +43 +44 +45 +46 +47 +48 +49 +50 
# File 'manifests/main/files.pp', line 6
@@ -153,7 +166,7 @@ class clamav_cd::main::files (
     seltype  => etc_t,
     seluser  => system_u,
     content  => template($cv_clamd_config_erb),
-#    notify   => Service[$cv_service],
+    notify   => Service[$cv_service],
   }
 
   # freshclam config file
@@ -168,6 +181,19 @@ class clamav_cd::main::files (
     seluser  => system_u,
     content  => template($cv_freshclam_erb),
   }
+
+  # freshclam service config file
+  file { $cv_freshclam_svc  :
+    ensure   => file,
+    owner    => 'root',
+    group    => 'root',
+    mode     => '0600',
+    selrange => s0,
+    selrole  => object_r,
+    seltype  => etc_t,
+    seluser  => system_u,
+    content  => template($cv_freshclam_svc_erb),
+  }
 }
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 4e0ff55..4e58037 100644 --- a/doc/puppet_classes/clamav_cd_3A_3Amain_3A_3Aservice.html +++ b/doc/puppet_classes/clamav_cd_3A_3Amain_3A_3Aservice.html @@ -112,7 +112,14 @@ 14 15 16 -17 +17 +18 +19 +20 +21 +22 +23 +24 
# File 'manifests/main/service.pp', line 6
@@ -122,12 +129,19 @@ 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,
-#  }
+  service { $cv_service:
+    ensure     => running,
+    hasstatus  => true,
+    hasrestart => true,
+    enable     => true,
+  }
+
+  service { $cv_freshclam:
+    ensure     => running,
+    hasstatus  => true,
+    hasrestart => true,
+    enable     => true,
+  }
 }
diff --git a/doc/puppet_classes/clamav_cd_3A_3Aparams.html b/doc/puppet_classes/clamav_cd_3A_3Aparams.html index ff5391b..7ccaeda 100644 --- a/doc/puppet_classes/clamav_cd_3A_3Aparams.html +++ b/doc/puppet_classes/clamav_cd_3A_3Aparams.html @@ -387,7 +387,10 @@ inherited by all classes except defines. 61 62 63 -64 +64 +65 +66 +67 
# File 'manifests/params.pp', line 29
@@ -413,16 +416,19 @@ class clamav_cd::params (
 
 ) {
   # service
-  $cv_service           = 'clamd@.service'
+  $cv_service             = 'clamd@.service'
+  $cv_freshclam           = 'freshclam'
 
   # dirs
-  $cv_config_d_dir      = '/etc/clamd.d'
+  $cv_config_d_dir        = '/etc/clamd.d'
 
   # files
-  $cv_clamd_config_file = "${cv_config_d_dir}/scan.conf"
-  $cv_clamd_config_erb  = 'clamav_cd/scan_conf.erb'
-  $cv_freshclam_file    = '/etc/freshclam.conf'
-  $cv_freshclam_erb     = 'clamav_cd/freshclam_conf.erb'
+  $cv_clamd_config_file   = "${cv_config_d_dir}/scan.conf"
+  $cv_clamd_config_erb    = 'clamav_cd/scan_conf.erb'
+  $cv_freshclam_file      = '/etc/freshclam.conf'
+  $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'
 
   # includes must be last