Recommit for updates in build 17

Merge remote-tracking branch 'origin/master' into jenkins-build-17
OP#785 temp disable service file control
2026-09-22 15:03:45 +02:00 · 2026-09-22 15:03:02 +02:00 · 2026-09-22 15:02:45 +02:00 · 2026-09-22 14:59:32 +02:00
2 changed files with 24 additions and 24 deletions
--- a/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Afiles.html
+++ b/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Afiles.html
@@ -227,18 +227,18 @@ class confdroid_clamav::main::files (
  }

  # clamd service config file
-  file { $cv_clamd_svc  :
-    ensure   =&gt; file,
-    owner    =&gt; &#39;root&#39;,
-    group    =&gt; &#39;root&#39;,
-    mode     =&gt; &#39;0600&#39;,
-    selrange =&gt; s0,
-    selrole  =&gt; object_r,
-    seltype  =&gt; etc_t,
-    seluser  =&gt; system_u,
-    content  =&gt; template($cv_clamd_svc_erb),
-    notify   =&gt; Service[$cv_service],
-  }
+#  file { $cv_clamd_svc  :
+#    ensure   =&gt; file,
+#    owner    =&gt; &#39;root&#39;,
+#    group    =&gt; &#39;root&#39;,
+#    mode     =&gt; &#39;0600&#39;,
+#    selrange =&gt; s0,
+#    selrole  =&gt; object_r,
+#    seltype  =&gt; etc_t,
+#    seluser  =&gt; system_u,
+#    content  =&gt; template($cv_clamd_svc_erb),
+#    notify   =&gt; Service[$cv_service],
+#  }

  # shell script for scanning and alerting
  file { $cv_shell_script  :
--- a/manifests/main/files.pp
+++ b/manifests/main/files.pp
@@ -51,18 +51,18 @@ class confdroid_clamav::main::files (
  }

  # 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],
-  }
+#  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
  file { $cv_shell_script  :
Author	SHA1	Message	Date
Jenkins Server	34ca6d4389	Recommit for updates in build 17	2026-09-22 15:03:45 +02:00
Jenkins Server	e65c98a16e	Merge remote-tracking branch 'origin/master' into jenkins-build-17	2026-09-22 15:03:02 +02:00
12ww1160	5e3dcbbd1b	OP#785 temp disable service file control	2026-09-22 15:02:45 +02:00
Jenkins Server	ec9f3674f2	Merge remote-tracking branch 'origin/master' into jenkins-build-16	2026-09-22 14:59:32 +02:00