confdroid/confdroid_clamav
1
0
Fork 0
Code Issues Wiki Activity

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

Browse Source 
Auto-merge for build 10

See merge request puppet/clamav_cd!7
This commit is contained in:
Jenkins
2025-06-08 12:05:25 +00:00
parent 424ab0de1d 36f63ed503
commit 51b8f60e27
4 changed files with 80 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.vscode/settings.json vendored
View File

@@ -21,6 +21,9 @@
"myusername",
"preludeanalyzername",
"preludeenable",
"safebrowsing"
"safebrowsing",
"tcpaddre",
"tcpaddress",
"tcpsocket"
]
}

74
doc/puppet_classes/clamav_cd_3A_3Aparams.html
View File

@@ -337,6 +337,42 @@ inherited by all classes except defines.
—
<div class='inline'>
<p>name of the analyzer used by prelude-admin.</p>
</div>
</li>
<li>
<span class='name'>cv_tcpsocket</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;3310&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>socket port</p>
</div>
</li>
<li>
<span class='name'>cv_tcpaddress</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;127.0.0.1&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>ip address to listen on</p>
</div>
</li>
@@ -352,8 +388,6 @@ inherited by all classes except defines.
<pre class="lines">
29
30
31
32
33
@@ -390,29 +424,35 @@ inherited by all classes except defines.
64
65
66
67</pre>
67
68
69
70
71</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 29</span>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 31</span>
class clamav_cd::params (
# installation
Array $reqpackages = [&#39;clamav&#39;,&#39;clamd&#39;],
String $pkg_ensure = &#39;present&#39;,
Array $reqpackages = [&#39;clamav&#39;,&#39;clamd&#39;],
String $pkg_ensure = &#39;present&#39;,
# clamd
String $cv_logfile = &#39;/var/log/clamd.scan&#39;,
String $cv_logfileunlock = &#39;no&#39;,
String $cv_logfilemaxsize = &#39;2M&#39;,
String $cv_logtime = &#39;yes&#39;,
String $cv_logclean = &#39;no&#39;,
String $cv_logsyslog = &#39;yes&#39;,
String $cv_logfacility = &#39;LOG_MAIL&#39;,
String $cv_logverbose = &#39;no&#39;,
String $cv_logrotate = &#39;yes&#39;,
String $cv_preludeenable = &#39;no&#39;,
String $cv_preludeanalyzername = &#39;ClamAV&#39;,
String $cv_logfile = &#39;/var/log/clamd.scan&#39;,
String $cv_logfileunlock = &#39;no&#39;,
String $cv_logfilemaxsize = &#39;2M&#39;,
String $cv_logtime = &#39;yes&#39;,
String $cv_logclean = &#39;no&#39;,
String $cv_logsyslog = &#39;yes&#39;,
String $cv_logfacility = &#39;LOG_MAIL&#39;,
String $cv_logverbose = &#39;no&#39;,
String $cv_logrotate = &#39;yes&#39;,
String $cv_preludeenable = &#39;no&#39;,
String $cv_preludeanalyzername = &#39;ClamAV&#39;,
String $cv_tcpsocket = &#39;3310&#39;,
String $cv_tcpaddress = &#39;127.0.0.1&#39;,
) {
# service

30
manifests/params.pp
View File

@@ -25,25 +25,29 @@
# @param [String] cv_preludeenable whether to enable prelude output.
# @param [String] cv_preludeanalyzername name of the analyzer used by
# prelude-admin.
# @param [String] cv_tcpsocket socket port
# @param [String] cv_tcpaddress ip address to listen on
##############################################################################
class clamav_cd::params (
# installation
Array $reqpackages = ['clamav','clamd'],
String $pkg_ensure = 'present',
Array $reqpackages = ['clamav','clamd'],
String $pkg_ensure = 'present',
# clamd
String $cv_logfile = '/var/log/clamd.scan',
String $cv_logfileunlock = 'no',
String $cv_logfilemaxsize = '2M',
String $cv_logtime = 'yes',
String $cv_logclean = 'no',
String $cv_logsyslog = 'yes',
String $cv_logfacility = 'LOG_MAIL',
String $cv_logverbose = 'no',
String $cv_logrotate = 'yes',
String $cv_preludeenable = 'no',
String $cv_preludeanalyzername = 'ClamAV',
String $cv_logfile = '/var/log/clamd.scan',
String $cv_logfileunlock = 'no',
String $cv_logfilemaxsize = '2M',
String $cv_logtime = 'yes',
String $cv_logclean = 'no',
String $cv_logsyslog = 'yes',
String $cv_logfacility = 'LOG_MAIL',
String $cv_logverbose = 'no',
String $cv_logrotate = 'yes',
String $cv_preludeenable = 'no',
String $cv_preludeanalyzername = 'ClamAV',
String $cv_tcpsocket = '3310',
String $cv_tcpaddress = '127.0.0.1',
) {
# service

3
templates/scan_conf.erb
View File

@@ -12,7 +12,8 @@ LogFacility <%= @cv_logfacility %>
LogVerbose <%= @cv_logverbose %>
LogRotate <%= @cv_logrotate %>
PreludeEnable <%= @cv_preludeenable %>
TCPSocket <%= @cv_tcpsocket %>
TCPAddr <<%= @cv_tcpaddress %>
#
# Set the name of the analyzer used by prelude-admin.
# Default: ClamAV