Recommit for updates in build 8
This commit is contained in:
@@ -132,7 +132,20 @@
|
||||
34
|
||||
35
|
||||
36
|
||||
37</pre>
|
||||
37
|
||||
38
|
||||
39
|
||||
40
|
||||
41
|
||||
42
|
||||
43
|
||||
44
|
||||
45
|
||||
46
|
||||
47
|
||||
48
|
||||
49
|
||||
50</pre>
|
||||
</td>
|
||||
<td>
|
||||
<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 => etc_t,
|
||||
seluser => system_u,
|
||||
content => template($cv_clamd_config_erb),
|
||||
# notify => Service[$cv_service],
|
||||
notify => Service[$cv_service],
|
||||
}
|
||||
|
||||
# freshclam config file
|
||||
@@ -168,6 +181,19 @@ class clamav_cd::main::files (
|
||||
seluser => system_u,
|
||||
content => template($cv_freshclam_erb),
|
||||
}
|
||||
|
||||
# freshclam service config file
|
||||
file { $cv_freshclam_svc :
|
||||
ensure => file,
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0600',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => etc_t,
|
||||
seluser => system_u,
|
||||
content => template($cv_freshclam_svc_erb),
|
||||
}
|
||||
}</pre>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -112,7 +112,14 @@
|
||||
14
|
||||
15
|
||||
16
|
||||
17</pre>
|
||||
17
|
||||
18
|
||||
19
|
||||
20
|
||||
21
|
||||
22
|
||||
23
|
||||
24</pre>
|
||||
</td>
|
||||
<td>
|
||||
<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 {
|
||||
require clamav_cd::main::files
|
||||
|
||||
# service { $cv_service:
|
||||
# ensure => running,
|
||||
# hasstatus => true,
|
||||
# hasrestart => true,
|
||||
# enable => true,
|
||||
# }
|
||||
service { $cv_service:
|
||||
ensure => running,
|
||||
hasstatus => true,
|
||||
hasrestart => true,
|
||||
enable => true,
|
||||
}
|
||||
|
||||
service { $cv_freshclam:
|
||||
ensure => running,
|
||||
hasstatus => true,
|
||||
hasrestart => true,
|
||||
enable => true,
|
||||
}
|
||||
}</pre>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -387,7 +387,10 @@ inherited by all classes except defines.
|
||||
61
|
||||
62
|
||||
63
|
||||
64</pre>
|
||||
64
|
||||
65
|
||||
66
|
||||
67</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 29</span>
|
||||
@@ -413,16 +416,19 @@ class clamav_cd::params (
|
||||
|
||||
) {
|
||||
# service
|
||||
$cv_service = 'clamd@.service'
|
||||
$cv_service = 'clamd@.service'
|
||||
$cv_freshclam = 'freshclam'
|
||||
|
||||
# dirs
|
||||
$cv_config_d_dir = '/etc/clamd.d'
|
||||
$cv_config_d_dir = '/etc/clamd.d'
|
||||
|
||||
# files
|
||||
$cv_clamd_config_file = "${cv_config_d_dir}/scan.conf"
|
||||
$cv_clamd_config_erb = 'clamav_cd/scan_conf.erb'
|
||||
$cv_freshclam_file = '/etc/freshclam.conf'
|
||||
$cv_freshclam_erb = 'clamav_cd/freshclam_conf.erb'
|
||||
$cv_clamd_config_file = "${cv_config_d_dir}/scan.conf"
|
||||
$cv_clamd_config_erb = 'clamav_cd/scan_conf.erb'
|
||||
$cv_freshclam_file = '/etc/freshclam.conf'
|
||||
$cv_freshclam_erb = 'clamav_cd/freshclam_conf.erb'
|
||||
$cv_freshclam_svc = '/usr/lib/systemd/system/freshclam.service'
|
||||
$cv_freshclam_svc_erb = 'clamav_cd/freshclam_svc.erb'
|
||||
|
||||
# includes must be last
|
||||
|
||||
|
||||
Reference in New Issue
Block a user