Compare commits

..

1 Commits

Author SHA1 Message Date
Jenkins Server
820d65151b Recommit for updates in build 9 2026-09-22 13:39:18 +02:00
6 changed files with 15 additions and 105 deletions

View File

@@ -34,7 +34,7 @@
- manage cronjob settings via parameters
- run cron job to scan the file system (by default starting at root, configurable) via clamdscan
- set ConcurrentDatabaseReload option `yes`/`no` to optimize RAM consumption. defaults to `no`
- manage `freshclam` and `clamd` services
- manage services
## Dependencies

View File

@@ -109,7 +109,7 @@
</li><li>
<p>set ConcurrentDatabaseReload option <code>yes</code>/<code>no</code> to optimize RAM consumption. defaults to <code>no</code></p>
</li><li>
<p>manage <code>freshclam</code> and <code>clamd</code> services</p>
<p>manage services</p>
</li></ul>
<h2 id="label-Dependencies">Dependencies</h2>

View File

@@ -109,7 +109,7 @@
</li><li>
<p>set ConcurrentDatabaseReload option <code>yes</code>/<code>no</code> to optimize RAM consumption. defaults to <code>no</code></p>
</li><li>
<p>manage <code>freshclam</code> and <code>clamd</code> services</p>
<p>manage services</p>
</li></ul>
<h2 id="label-Dependencies">Dependencies</h2>

View File

@@ -553,78 +553,6 @@ inherited by all classes except defines.
&mdash;
<div class='inline'>
<p>whether to enable concurrent database reloads. This is useful when you have multiple clamd instances running on the same machine. If you have only one clamd instance, this should be set to ‘no’.</p>
</div>
</li>
<li>
<span class='name'>cv_clamd_max_mem</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;512M&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>maximum memory usage for clamd.</p>
</div>
</li>
<li>
<span class='name'>cv_clamd_cpu_quota</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;30%&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>maximum CPU usage for clamd.</p>
</div>
</li>
<li>
<span class='name'>cv_nice_value</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;19&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>nice value for clamd. This is a number between -20 and 19. The lower the number, the higher the priority. The default is 19, which is the lowest priority.</p>
</div>
</li>
<li>
<span class='name'>cv_timeout_start_sec</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;420&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>timeout for starting the clamd service.</p>
</div>
</li>
@@ -640,6 +568,12 @@ inherited by all classes except defines.
<pre class="lines">
44
45
46
47
48
49
50
51
52
@@ -688,20 +622,10 @@ inherited by all classes except defines.
95
96
97
98
99
100
101
102
103
104
105
106
107
108</pre>
98</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 50</span>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 44</span>
class confdroid_clamav::params (
@@ -733,10 +657,6 @@ class confdroid_clamav::params (
Boolean $cv_enable_clamd = true,
Boolean $cv_use_excludepaths = true,
String $cv_concurrentdatabasereload = &#39;no&#39;,
String $cv_clamd_max_mem = &#39;512M&#39;,
String $cv_clamd_cpu_quota = &#39;30%&#39;,
String $cv_nice_value = &#39;19&#39;,
String $cv_timeout_start_sec = &#39;420&#39;
) {
# service

View File

@@ -40,12 +40,6 @@
# database reloads. This is useful when you have multiple clamd instances
# running on the same machine. If you have only one clamd instance, this
# should be set to 'no'.
# @param [String] cv_clamd_max_mem maximum memory usage for clamd.
# @param [String] cv_clamd_cpu_quota maximum CPU usage for clamd.
# @param [String] cv_nice_value nice value for clamd. This is a number between
# -20 and 19. The lower the number, the higher the priority. The default is
# 19, which is the lowest priority.
# @param [String] cv_timeout_start_sec timeout for starting the clamd service.
##############################################################################
class confdroid_clamav::params (
@@ -77,10 +71,6 @@ class confdroid_clamav::params (
Boolean $cv_enable_clamd = true,
Boolean $cv_use_excludepaths = true,
String $cv_concurrentdatabasereload = 'no',
String $cv_clamd_max_mem = '512M',
String $cv_clamd_cpu_quota = '30%',
String $cv_nice_value = '19',
String $cv_timeout_start_sec = '420'
) {
# service

View File

@@ -13,10 +13,10 @@ ExecStart = /usr/sbin/clamd -c /etc/clamd.d/%i.conf
# Reload the database
ExecReload=/bin/kill -USR2 $MAINPID
Restart = on-failure
TimeoutStartSec=<%= @cv_timeout_start_sec %>
MemoryMax=<%= @cv_clamd_max_mem %>
CPUQuota=<%= @cv_clamd_cpu_quota %>
Nice=<%= @cv_nice_value %>
TimeoutStartSec=420
MemoryLimit=1024M
CPUQuota=30%
Nice=19
[Install]
WantedBy = multi-user.target