recommit for updates in build 8
This commit is contained in:
@@ -121,7 +121,35 @@
|
||||
23
|
||||
24
|
||||
25
|
||||
26</pre>
|
||||
26
|
||||
27
|
||||
28
|
||||
29
|
||||
30
|
||||
31
|
||||
32
|
||||
33
|
||||
34
|
||||
35
|
||||
36
|
||||
37
|
||||
38
|
||||
39
|
||||
40
|
||||
41
|
||||
42
|
||||
43
|
||||
44
|
||||
45
|
||||
46
|
||||
47
|
||||
48
|
||||
49
|
||||
50
|
||||
51
|
||||
52
|
||||
53
|
||||
54</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
|
||||
@@ -146,6 +174,34 @@ class alloy_cd::main::files (
|
||||
content => template('alloy_cd/config.alloy.erb'),
|
||||
notify => Service[$ay_service],
|
||||
}
|
||||
|
||||
# manage logrotate for rsyslog to allow adm group membership
|
||||
file { '/etc/logrotate.d/rsyslog':
|
||||
ensure => file,
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0644',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => etc_t,
|
||||
seluser => system_u,
|
||||
content => template('alloy_cd/logrotate.rsyslog.erb'),
|
||||
}
|
||||
|
||||
# manage log file group permissions
|
||||
file { '/var/log/messages':
|
||||
ensure => file,
|
||||
owner => 'root',
|
||||
group => 'adm',
|
||||
mode => '0640',
|
||||
}
|
||||
|
||||
file { '/var/log/secure':
|
||||
ensure => file,
|
||||
owner => 'root',
|
||||
group => 'adm',
|
||||
mode => '0640',
|
||||
}
|
||||
}</pre>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -112,8 +112,7 @@
|
||||
14
|
||||
15
|
||||
16
|
||||
17
|
||||
18</pre>
|
||||
17</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/main/service.pp', line 6</span>
|
||||
@@ -122,7 +121,6 @@ class alloy_cd::main::service (
|
||||
|
||||
) inherits alloy_cd::params {
|
||||
require alloy_cd::main::files
|
||||
require alloy_cd::main::user
|
||||
|
||||
service { $ay_service:
|
||||
ensure => running,
|
||||
|
||||
@@ -69,8 +69,6 @@
|
||||
|
||||
<span class='object_link'><a href="alloy_cd_3A_3Amain_3A_3Adirs.html" title="puppet_classes::alloy_cd::main::dirs (puppet_class)">alloy_cd::main::dirs</a></span><br/>
|
||||
|
||||
<span class='object_link'><a href="alloy_cd_3A_3Amain_3A_3Auser.html" title="puppet_classes::alloy_cd::main::user (puppet_class)">alloy_cd::main::user</a></span><br/>
|
||||
|
||||
<span class='object_link'><a href="alloy_cd_3A_3Amain_3A_3Afiles.html" title="puppet_classes::alloy_cd::main::files (puppet_class)">alloy_cd::main::files</a></span><br/>
|
||||
|
||||
<span class='object_link'><a href="alloy_cd_3A_3Amain_3A_3Aconfig.html" title="puppet_classes::alloy_cd::main::config (puppet_class)">alloy_cd::main::config</a></span><br/>
|
||||
@@ -316,7 +314,7 @@
|
||||
<span class='type'>(<tt>Array</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>['wheel','adm']</tt>)</em>
|
||||
<em class="default">(defaults to: <tt>['systemd-journal','adm']</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
@@ -413,7 +411,7 @@ class alloy_cd::params (
|
||||
# user
|
||||
Boolean $ay_manage_user = true,
|
||||
String $ay_user = 'alloy',
|
||||
Array $ay_groups = ['wheel','adm'],
|
||||
Array $ay_groups = ['systemd-journal','adm'],
|
||||
String $ay_user_shell = '/sbin/nologin',
|
||||
|
||||
) {
|
||||
|
||||
Reference in New Issue
Block a user