Merge branch 'jenkins-build-13' into 'master'

Auto-merge for build 13

See merge request puppet/clamav_cd!10
This commit is contained in:
Jenkins
2025-06-08 12:35:31 +00:00
4 changed files with 29 additions and 2 deletions

View File

@@ -5,6 +5,7 @@
"behaviour", "behaviour",
"bofh", "bofh",
"clamd", "clamd",
"clamonacc",
"clamscan", "clamscan",
"Clamuko", "Clamuko",
"clamupdate", "clamupdate",
@@ -14,6 +15,7 @@
"fanotify", "fanotify",
"filesize", "filesize",
"freshclam", "freshclam",
"getsebool",
"INADDR", "INADDR",
"libclamav", "libclamav",
"logclean", "logclean",
@@ -33,14 +35,18 @@
"PCRE", "PCRE",
"preludeanalyzername", "preludeanalyzername",
"preludeenable", "preludeenable",
"recieve",
"RLIMIT", "RLIMIT",
"safebrowsing", "safebrowsing",
"setsebool",
"subsig", "subsig",
"subsigs", "subsigs",
"tcpaddre", "tcpaddre",
"tcpaddress", "tcpaddress",
"tcpsocket", "tcpsocket",
"VIRUSEVENT",
"virusgroup", "virusgroup",
"VIRUSNAME",
"XMLDOCS", "XMLDOCS",
"xxxyyzzzz" "xxxyyzzzz"
] ]

View File

@@ -106,7 +106,14 @@ clamav_cd.
8 8
9 9
10 10
11</pre> 11
12
13
14
15
16
17
18</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/main/config.pp', line 7</span> <pre class="code"><span class="info file"># File 'manifests/main/config.pp', line 7</span>
@@ -115,6 +122,13 @@ class clamav_cd::main::config (
) inherits clamav_cd::params { ) inherits clamav_cd::params {
include clamav_cd::main::service include clamav_cd::main::service
# Ensure the SELinux boolean antivirus_can_scan_system is enabled if disabled
exec { &#39;enable_antivirus_can_scan_system&#39;:
command =&gt; &#39;/usr/sbin/setsebool -P antivirus_can_scan_system 1&#39;,
unless =&gt; &#39;/usr/sbin/getsebool antivirus_can_scan_system | grep --quiet &quot;on&quot;&#39;,
path =&gt; [&#39;/usr/sbin&#39;, &#39;/bin&#39;],
}
}</pre> }</pre>
</td> </td>
</tr> </tr>

View File

@@ -8,4 +8,11 @@ class clamav_cd::main::config (
) inherits clamav_cd::params { ) inherits clamav_cd::params {
include clamav_cd::main::service include clamav_cd::main::service
# Ensure the SELinux boolean antivirus_can_scan_system is enabled if disabled
exec { 'enable_antivirus_can_scan_system':
command => '/usr/sbin/setsebool -P antivirus_can_scan_system 1',
unless => '/usr/sbin/getsebool antivirus_can_scan_system | grep --quiet "on"',
path => ['/usr/sbin', '/bin'],
}
} }

View File

@@ -677,7 +677,7 @@ User clamscan
#OnAccessMaxThreads 10 #OnAccessMaxThreads 10
# Max amount of time (in milliseconds) that the OnAccess client should spend # Max amount of time (in milliseconds) that the OnAccess client should spend
# for every connect, send, and recieve attempt when communicating with clamd # for every connect, send, and receive attempt when communicating with clamd
# via curl. # via curl.
# Default: 5000 (5 seconds) # Default: 5000 (5 seconds)
# OnAccessCurlTimeout 10000 # OnAccessCurlTimeout 10000