Compare commits

..

1 Commits

Author SHA1 Message Date
Jenkins Server
34ca6d4389 Recommit for updates in build 17 2026-09-22 15:03:45 +02:00
5 changed files with 32 additions and 53 deletions

View File

@@ -227,18 +227,18 @@ class confdroid_clamav::main::files (
} }
# clamd service config file # clamd service config file
file { $cv_clamd_svc : # file { $cv_clamd_svc :
ensure => file, # ensure => file,
owner => 'root', # owner => 'root',
group => 'root', # group => 'root',
mode => '0600', # mode => '0600',
selrange => s0, # selrange => s0,
selrole => object_r, # selrole => object_r,
seltype => etc_t, # seltype => etc_t,
seluser => system_u, # seluser => system_u,
content => template($cv_clamd_svc_erb), # content => template($cv_clamd_svc_erb),
notify => Service[$cv_service], # notify => Service[$cv_service],
} # }
# shell script for scanning and alerting # shell script for scanning and alerting
file { $cv_shell_script : file { $cv_shell_script :

View File

@@ -110,14 +110,7 @@ confdroid_clamav
12 12
13 13
14 14
15 15</pre>
16
17
18
19
20
21
22</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/main/install.pp', line 7</span> <pre class="code"><span class="info file"># File 'manifests/main/install.pp', line 7</span>
@@ -127,16 +120,9 @@ class confdroid_clamav::main::install (
) inherits confdroid_clamav::params { ) inherits confdroid_clamav::params {
require confdroid_resources::main::epel require confdroid_resources::main::epel
if $cv_enable_clamd == true { package { $cv_reqpackages:
package { &#39;clamd&#39;:
ensure =&gt; $cv_pkg_ensure, ensure =&gt; $cv_pkg_ensure,
} }
}
else {
package { &#39;clamd&#39;:
ensure =&gt; &#39;absent&#39;,
}
}
}</pre> }</pre>
</td> </td>
</tr> </tr>

View File

@@ -51,18 +51,18 @@ class confdroid_clamav::main::files (
} }
# clamd service config file # clamd service config file
file { $cv_clamd_svc : # file { $cv_clamd_svc :
ensure => file, # ensure => file,
owner => 'root', # owner => 'root',
group => 'root', # group => 'root',
mode => '0600', # mode => '0600',
selrange => s0, # selrange => s0,
selrole => object_r, # selrole => object_r,
seltype => etc_t, # seltype => etc_t,
seluser => system_u, # seluser => system_u,
content => template($cv_clamd_svc_erb), # content => template($cv_clamd_svc_erb),
notify => Service[$cv_service], # notify => Service[$cv_service],
} # }
# shell script for scanning and alerting # shell script for scanning and alerting
file { $cv_shell_script : file { $cv_shell_script :

View File

@@ -9,14 +9,7 @@ class confdroid_clamav::main::install (
) inherits confdroid_clamav::params { ) inherits confdroid_clamav::params {
require confdroid_resources::main::epel require confdroid_resources::main::epel
if $cv_enable_clamd == true { package { $cv_reqpackages:
package { 'clamd':
ensure => $cv_pkg_ensure, ensure => $cv_pkg_ensure,
} }
} }
else {
package { 'clamd':
ensure => 'absent',
}
}
}

View File

@@ -14,9 +14,9 @@ ExecStart = /usr/sbin/clamd -c /etc/clamd.d/%i.conf
ExecReload=/bin/kill -USR2 $MAINPID ExecReload=/bin/kill -USR2 $MAINPID
Restart = on-failure Restart = on-failure
TimeoutStartSec=<%= @cv_timeout_start_sec %> TimeoutStartSec=<%= @cv_timeout_start_sec %>
MemoryMax=<%= @cv_clamd_max_mem %> # MemoryMax=<%= @cv_clamd_max_mem %>
CPUQuota=<%= @cv_clamd_cpu_quota %> # CPUQuota=<%= @cv_clamd_cpu_quota %>
Nice=<%= @cv_nice_value %> # Nice=<%= @cv_nice_value %>
[Install] [Install]
WantedBy = multi-user.target WantedBy = multi-user.target