recommit for updates in build 149

2017-07-30 16:41:05 +02:00
parent a00a4665f5
commit 28a1ed3ef9
39 changed files with 126 additions and 65 deletions
--- a/doc/puppet_classes/cd_nagios.html
+++ b/doc/puppet_classes/cd_nagios.html
@@ -139,7 +139,7 @@ class cd_nagios {
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 16:19:59 2017 by
+  Generated on Sun Jul 30 16:40:55 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html
@@ -230,7 +230,7 @@ class cd_nagios::certbot::certs (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 16:20:03 2017 by
+  Generated on Sun Jul 30 16:40:59 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
@@ -378,7 +378,7 @@ class cd_nagios::client::target (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 16:20:04 2017 by
+  Generated on Sun Jul 30 16:40:59 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 16:20:04 2017 by
+  Generated on Sun Jul 30 16:41:00 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
@@ -195,7 +195,7 @@ class cd_nagios::main::config (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 16:20:03 2017 by
+  Generated on Sun Jul 30 16:40:59 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
@@ -468,7 +468,7 @@ class cd_nagios::main::dirs (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 16:20:03 2017 by
+  Generated on Sun Jul 30 16:40:59 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
@@ -213,7 +213,7 @@ class cd_nagios::main::install (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 16:20:03 2017 by
+  Generated on Sun Jul 30 16:40:59 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
@@ -194,7 +194,7 @@ class cd_nagios::main::user (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 16:20:03 2017 by
+  Generated on Sun Jul 30 16:40:59 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html
@@ -217,7 +217,7 @@ class cd_nagios::nagios::objects::add_contact_rules (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 16:20:05 2017 by
+  Generated on Sun Jul 30 16:41:01 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html
@@ -215,7 +215,7 @@ class cd_nagios::nagios::objects::add_contactgroups_rules (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 16:20:05 2017 by
+  Generated on Sun Jul 30 16:41:01 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroup_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroup_rules.html
@@ -214,7 +214,7 @@ class cd_nagios::nagios::objects::add_hostgroup_rules (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 16:20:05 2017 by
+  Generated on Sun Jul 30 16:41:01 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroup_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroup_rules.html
@@ -224,7 +224,7 @@ class cd_nagios::nagios::objects::add_servicegroup_rules (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 16:20:05 2017 by
+  Generated on Sun Jul 30 16:41:01 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiod_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiod_rules.html
@@ -222,7 +222,7 @@ class cd_nagios::nagios::objects::add_timeperiod_rules (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 16:20:05 2017 by
+  Generated on Sun Jul 30 16:41:01 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html
@@ -597,7 +597,7 @@ class cd_nagios::nagios::objects::commands (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 16:20:04 2017 by
+  Generated on Sun Jul 30 16:41:00 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html
@@ -182,7 +182,7 @@ class cd_nagios::nagios::objects::config (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 16:20:04 2017 by
+  Generated on Sun Jul 30 16:41:00 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontactgroups.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontactgroups.html
@@ -237,7 +237,7 @@ class cd_nagios::nagios::objects::contactgroups (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 16:20:05 2017 by
+  Generated on Sun Jul 30 16:41:00 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html
@@ -280,7 +280,7 @@ class cd_nagios::nagios::objects::contacts (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 16:20:04 2017 by
+  Generated on Sun Jul 30 16:41:00 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Ahostgroups.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Ahostgroups.html
@@ -551,7 +551,7 @@ class cd_nagios::nagios::objects::hostgroups (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 16:20:04 2017 by
+  Generated on Sun Jul 30 16:41:00 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aservicegroups.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aservicegroups.html
@@ -235,7 +235,7 @@ class cd_nagios::nagios::objects::servicegroups (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 16:20:05 2017 by
+  Generated on Sun Jul 30 16:41:00 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html
@@ -305,7 +305,7 @@ class cd_nagios::nagios::objects::template_rules (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 16:20:05 2017 by
+  Generated on Sun Jul 30 16:41:01 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atimeperiods.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atimeperiods.html
@@ -285,7 +285,7 @@ class cd_nagios::nagios::objects::timeperiods (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 16:20:04 2017 by
+  Generated on Sun Jul 30 16:41:00 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -876,7 +876,7 @@ templates and for firewall
        <span class='type'>(<tt>string</tt>)</span>
      
      
-        <em class="default">(defaults to: <tt>&#39;/sbin/nologin&#39;</tt>)</em>
+        <em class="default">(defaults to: <tt>&#39;/bin/bash&#39;</tt>)</em>
      
      
        &mdash;
@@ -5264,8 +5264,7 @@ configuration file.</p>
 998
 999
 1000
-1001
-1002</pre>
+1001</pre>
      </td>
      <td>
        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 648</span>
@@ -5328,7 +5327,7 @@ $ng_u_comment               = &#39;Nagios service user&#39;,
 $ng_u_uid                   = &#39;1004&#39;,
 $ng_user_home               = &#39;/var/spool/nagios&#39;,
 $ng_u_groups                = undef,
-$ng_user_shell              = &#39;/sbin/nologin&#39;,
+$ng_user_shell              = &#39;/bin/bash&#39;,

 # cgi settings
 $ng_context_help            = &#39;1&#39;,
@@ -5562,6 +5561,7 @@ $ng_htpasswd_head           = &#39;cd_nagios/nagios/htpasswd_head.erb&#39;
 $ng_htpasswd_rule           = &#39;cd_nagios/nagios/htpasswd_rule.erb&#39;
 $ng_taccgi_erb              = &#39;cd_nagios/selinux/taccgi.erb&#39;
 $ng_statcgi_erb             = &#39;cd_nagios/selinux/statuscgi.erb&#39;
+$ng_checknrpe_erb           = &#39;cd_nagios/selinux/checknrpe.erb&#39;
 $ng_nagios_conf             = &#39;/etc/httpd/conf.d/nagios.conf&#39;
 $ng_nagios_conf_erb         = &#39;cd_nagios/httpd/nagios_conf.erb&#39;
 $ng_welcome_conf            = &#39;/etc/httpd/conf.d/welcome.conf&#39;
@@ -5617,8 +5617,6 @@ $ng_cntctgrps_rule_erb      = &#39;cd_nagios/nagios/contactgroups_cfg_rule.erb&#
 $ng_target_command          = &quot;${ng_conf_d_dir}/nagios_commands_base.cfg&quot;
 $ng_nagios_service_cmd      = &#39;check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios&#39;

-# nrpe
-$ng_nrpe_file               = &quot;${ng_main_dir}/nrpe.cfg&quot;

 # includes must be last

@@ -5632,7 +5630,7 @@ $ng_nrpe_file               = &quot;${ng_main_dir}/nrpe.cfg&quot;
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 16:20:03 2017 by
+  Generated on Sun Jul 30 16:40:59 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -183,7 +183,28 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 74
 75
 76
-77</pre>
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98</pre>
      </td>
      <td>
        <pre class="code"><span class="info file"># File 'manifests/selinux/config.pp', line 24</span>
@@ -240,6 +261,27 @@ class cd_nagios::selinux::config (
      refreshonly =&gt;  true,
      notify      =&gt;  Service[$ng_service],
    }
+
+    # sealert check_nrpe
+
+    exec { &#39;create_policy_checknrpe&#39;:
+      command     =&gt;  template($ng_checknrpe_erb),
+      path        =&gt;  [&#39;/usr/bin&#39;,&#39;/usr/sbin&#39;],
+      cwd         =&gt;  $ng_user_home,
+      creates     =&gt;  &quot;${ng_user_home}/my-checknrpe.pp&quot;,
+      notify      =&gt;  Exec[&#39;semodule_checknrpe&#39;],
+    }
+
+    exec { &#39;semodule_checknrpe&#39;:
+      command     =&gt;  &#39;semodule -i my-checknrpe.pp&#39;,
+      path        =&gt;  [&#39;/usr/bin&#39;,&#39;/usr/sbin&#39;],
+      cwd         =&gt;  $ng_user_home,
+      require     =&gt;  Exec[&#39;create_policy_checknrpe&#39;],
+      refreshonly =&gt;  true,
+      notify      =&gt;  Service[$ng_service],
+    }
+
+
  }
 }</pre>
      </td>
@@ -249,7 +291,7 @@ class cd_nagios::selinux::config (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 16:20:04 2017 by
+  Generated on Sun Jul 30 16:41:00 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 16:20:04 2017 by
+  Generated on Sun Jul 30 16:41:00 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -334,7 +334,7 @@ class cd_nagios::server::files (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 16:20:03 2017 by
+  Generated on Sun Jul 30 16:40:59 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -310,7 +310,7 @@ class cd_nagios::server::service (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 16:20:04 2017 by
+  Generated on Sun Jul 30 16:41:00 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>