recommit for updates in build 20

This commit is contained in:
Jenkins Server
2017-07-28 18:54:36 +02:00
parent 1b54ad5467
commit af92ee8bd6
15 changed files with 98 additions and 26 deletions

View File

@@ -140,7 +140,7 @@ class cd_nrpe {
</div>
<div id="footer">
Generated on Fri Jul 28 18:41:53 2017 by
Generated on Fri Jul 28 18:54:33 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -165,7 +165,7 @@ class cd_nrpe::firewall::iptables (
</div>
<div id="footer">
Generated on Fri Jul 28 18:41:54 2017 by
Generated on Fri Jul 28 18:54:34 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -154,7 +154,7 @@ class cd_nrpe::main::config (
</div>
<div id="footer">
Generated on Fri Jul 28 18:41:54 2017 by
Generated on Fri Jul 28 18:54:34 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -205,7 +205,7 @@ class cd_nrpe::main::dirs (
</div>
<div id="footer">
Generated on Fri Jul 28 18:41:54 2017 by
Generated on Fri Jul 28 18:54:34 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -148,7 +148,25 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
40
41
42
43</pre>
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 23</span>
@@ -159,6 +177,8 @@ class cd_nrpe::main::files (
require cd_nrpe::main::dirs
# manage /etc/nagios/nrpe.cfg
file { $ne_main_conf_file:
ensure =&gt; file,
path =&gt; $ne_main_conf_file,
@@ -169,6 +189,22 @@ class cd_nrpe::main::files (
selrole =&gt; object_r,
seltype =&gt; nrpe_etc_t,
seluser =&gt; system_u,
content =&gt; template($ne_main_conf_erb),
notify =&gt; Service[$ne_service],
}
# manage /etc/sysconfig/nrpe
file { $ne_nrpe_conf_file:
ensure =&gt; file,
path =&gt; $ne_nrpe_conf_file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0640&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
content =&gt; template($ne_nrpe_conf_erb),
notify =&gt; Service[$ne_service],
}
@@ -181,7 +217,7 @@ class cd_nrpe::main::files (
</div>
<div id="footer">
Generated on Fri Jul 28 18:41:54 2017 by
Generated on Fri Jul 28 18:54:34 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -160,7 +160,7 @@ class cd_nrpe::main::install (
</div>
<div id="footer">
Generated on Fri Jul 28 18:41:54 2017 by
Generated on Fri Jul 28 18:54:34 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -158,7 +158,7 @@ class cd_nrpe::main::service (
require cd_nrpe::firewall::iptables
}
require cd_nrpe::main::files
require cd_nrpe::main::install
service { $ne_service:
ensure =&gt; running,
@@ -175,7 +175,7 @@ class cd_nrpe::main::service (
</div>
<div id="footer">
Generated on Fri Jul 28 18:41:54 2017 by
Generated on Fri Jul 28 18:54:34 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -193,7 +193,7 @@ class cd_nrpe::main::user (
</div>
<div id="footer">
Generated on Fri Jul 28 18:41:54 2017 by
Generated on Fri Jul 28 18:54:34 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

View File

@@ -596,7 +596,7 @@ one
<span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;\&quot;|`&amp;&gt;&lt;\&#39;\\[]{};\r\n\&quot;&#39;</tt>)</em>
<em class="default">(defaults to: <tt>&#39;&quot;|`&amp;&gt;&lt;\&#39;\\[]{};\r\n\&quot;&#39;</tt>)</em>
&mdash;
@@ -906,7 +906,9 @@ needed.</p>
159
160
161
162</pre>
162
163
164</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 90</span>
@@ -946,7 +948,7 @@ $ne_ssl_cert_file = &quot;/etc/pki/tls/certs/${::fqdn}.crt.pem&quot;,
$ne_ssl_privatekey_file = &quot;/etc/pki/tls/private/${::fqdn}.key.pem&quot;,
$ne_ssl_client_certs = &#39;2&#39;,
$ne_ssl_logging = &#39;0x00&#39;,
$ne_nasty_metachars = &#39;\&quot;|`&amp;&gt;&lt;\&#39;\\[]{};\r\n\&quot;&#39;,
$ne_nasty_metachars = &#39;&quot;|`&amp;&gt;&lt;\&#39;\\[]{};\r\n\&quot;&#39;,
$ne_include_file = &#39;&#39;,
# nrpe.conf
@@ -976,8 +978,10 @@ $ne_run_dir = &#39;/var/run/nrpe&#39;
# files
$ne_main_conf_file = &#39;/etc/nagios/nrpe.cfg&#39;
$ne_nrpe_conf_erb = &#39;cd_nrpe/nrpe_cfg.erb&#39;
$ne_main_conf_erb = &#39;cd_nrpe/nrpe_cfg.erb&#39;
$ne_nrpe_pid_file = &quot;${ne_run_dir}/nrpe.pid&quot;
$ne_nrpe_conf_file = &#39;/etc/sysconfig/nrpe&#39;
$ne_nrpe_conf_erb = &#39;cd_nrpe/nrpe_conf.erb&#39;
# includes must be last
@@ -991,7 +995,7 @@ $ne_nrpe_pid_file = &quot;${ne_run_dir}/nrpe.pid&quot;
</div>
<div id="footer">
Generated on Fri Jul 28 18:41:54 2017 by
Generated on Fri Jul 28 18:54:34 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>