recommit for updates in build 13

This commit is contained in:
2018-04-29 13:45:04 +02:00
parent 88aa7877a4
commit 9a19017499
4 changed files with 53 additions and 12 deletions

View File

@@ -4929,8 +4929,6 @@ particular item.</p>
<span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/usr/lib64/nagios/plugins&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -4947,8 +4945,6 @@ particular item.</p>
<span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/usr/lib64/nagios/plugins/eventhandlers&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -5335,9 +5331,7 @@ particular item.</p>
1013
1014
1015
1016
1017
1018</pre>
1016</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 655</span>
@@ -5596,9 +5590,6 @@ $ng_loadctl_options = &#39;jobs_max=100;backoff_limit=10;rampup_change=5
# single nagios checks
$ng_enable_swap_check = true,
# resource.cfg
$ng_user_arg1 = &#39;/usr/lib64/nagios/plugins&#39;,
$ng_user_arg2 = &#39;/usr/lib64/nagios/plugins/eventhandlers&#39;,
) {
@@ -5660,6 +5651,7 @@ $ng_ssl_vhost_erb = &#39;cd_nagios/httpd/nagios_ssl_vhost.erb&#39;
$ng_nagios_cfg_file = &quot;${ng_main_dir}/nagios.cfg&quot;
$ng_nagios_cfg_erb = &#39;cd_nagios/nagios/nagios_cfg.erb&#39;
$ng_resource_erb = &#39;cd_nagios/nagios/resource_cfg.erb&#39;
$ng_grep_erb = &#39;cd_nagios/selinux/grep.erb&#39;
# certbot
$ng_certbot_main_dir = &#39;/etc/letsencrypt&#39;

View File

@@ -239,7 +239,26 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
130
131
132
133</pre>
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/selinux/config.pp', line 23</span>
@@ -353,6 +372,25 @@ class cd_nagios::selinux::config (
refreshonly =&gt; true,
notify =&gt; Service[$ng_service],
}
# sealert grep
exec { &#39;create_policy_grep&#39;:
command =&gt; template($ng_grep_erb),
path =&gt; [&#39;/usr/bin&#39;,&#39;/usr/sbin&#39;],
cwd =&gt; $ng_user_home,
creates =&gt; &quot;${ng_user_home}/my-grep.pp&quot;,
notify =&gt; Exec[&#39;semodule_statusdat&#39;],
}
exec { &#39;semodule_grep&#39;:
command =&gt; &quot;semodule -i ${ng_user_home}/my-grep.pp&quot;,
path =&gt; [&#39;/usr/bin&#39;,&#39;/usr/sbin&#39;],
cwd =&gt; $ng_user_home,
require =&gt; Exec[&#39;create_policy_grep&#39;],
refreshonly =&gt; true,
notify =&gt; Service[$ng_service],
}
}
}</pre>
</td>