Recommit for updates in build 7

This commit is contained in:
Jenkins Server
2025-06-08 13:41:02 +02:00
parent c4bae214e1
commit e708a0161d
3 changed files with 62 additions and 16 deletions

View File

@@ -132,7 +132,20 @@
34 34
35 35
36 36
37</pre> 37
38
39
40
41
42
43
44
45
46
47
48
49
50</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span> <pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
@@ -153,7 +166,7 @@ class clamav_cd::main::files (
seltype =&gt; etc_t, seltype =&gt; etc_t,
seluser =&gt; system_u, seluser =&gt; system_u,
content =&gt; template($cv_clamd_config_erb), content =&gt; template($cv_clamd_config_erb),
# notify =&gt; Service[$cv_service], notify =&gt; Service[$cv_service],
} }
# freshclam config file # freshclam config file
@@ -168,6 +181,19 @@ class clamav_cd::main::files (
seluser =&gt; system_u, seluser =&gt; system_u,
content =&gt; template($cv_freshclam_erb), content =&gt; template($cv_freshclam_erb),
} }
# freshclam service config file
file { $cv_freshclam_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_freshclam_svc_erb),
}
}</pre> }</pre>
</td> </td>
</tr> </tr>

View File

@@ -112,7 +112,14 @@
14 14
15 15
16 16
17</pre> 17
18
19
20
21
22
23
24</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/main/service.pp', line 6</span> <pre class="code"><span class="info file"># File 'manifests/main/service.pp', line 6</span>
@@ -122,12 +129,19 @@ class clamav_cd::main::service (
) inherits clamav_cd::params { ) inherits clamav_cd::params {
require clamav_cd::main::files require clamav_cd::main::files
# service { $cv_service: service { $cv_service:
# ensure =&gt; running, ensure =&gt; running,
# hasstatus =&gt; true, hasstatus =&gt; true,
# hasrestart =&gt; true, hasrestart =&gt; true,
# enable =&gt; true, enable =&gt; true,
# } }
service { $cv_freshclam:
ensure =&gt; running,
hasstatus =&gt; true,
hasrestart =&gt; true,
enable =&gt; true,
}
}</pre> }</pre>
</td> </td>
</tr> </tr>

View File

@@ -387,7 +387,10 @@ inherited by all classes except defines.
61 61
62 62
63 63
64</pre> 64
65
66
67</pre>
</td> </td>
<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 29</span>
@@ -414,6 +417,7 @@ class clamav_cd::params (
) { ) {
# service # service
$cv_service = &#39;clamd@.service&#39; $cv_service = &#39;clamd@.service&#39;
$cv_freshclam = &#39;freshclam&#39;
# dirs # dirs
$cv_config_d_dir = &#39;/etc/clamd.d&#39; $cv_config_d_dir = &#39;/etc/clamd.d&#39;
@@ -423,6 +427,8 @@ class clamav_cd::params (
$cv_clamd_config_erb = &#39;clamav_cd/scan_conf.erb&#39; $cv_clamd_config_erb = &#39;clamav_cd/scan_conf.erb&#39;
$cv_freshclam_file = &#39;/etc/freshclam.conf&#39; $cv_freshclam_file = &#39;/etc/freshclam.conf&#39;
$cv_freshclam_erb = &#39;clamav_cd/freshclam_conf.erb&#39; $cv_freshclam_erb = &#39;clamav_cd/freshclam_conf.erb&#39;
$cv_freshclam_svc = &#39;/usr/lib/systemd/system/freshclam.service&#39;
$cv_freshclam_svc_erb = &#39;clamav_cd/freshclam_svc.erb&#39;
# includes must be last # includes must be last