recommit for updates in build 10

This commit is contained in:
2018-04-29 12:47:18 +02:00
parent 2f9cc5f40e
commit a4239d9f85
2 changed files with 11 additions and 37 deletions

View File

@@ -226,25 +226,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138</pre>
120</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/server/files.pp', line 23</span>
@@ -296,24 +278,6 @@ class cd_nagios::server::files (
notify =&gt; Service[$ng_service],
}
# manage resources.cfg file
file { $ng_resource_file:
ensure =&gt; file,
path =&gt; $ng_resource_file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; nagios_etc_t,
seluser =&gt; system_u,
content =&gt; template($ng_cgi_cfg_erb),
notify =&gt; Service[$ng_service],
}
## Apache files
# since we use vhost files, we do not want the regular file to appear
# after upgrades to avoid conflicts