recommit for updates in build 67

CHANGELOG.md

@@ -8,6 +8,16 @@ Changelog of Git Changelog.
 <h2> No issue </h2>
 
 
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/5ff13eb48507109">5ff13eb48507109</a> Jenkins Server <i>2017-07-24 11:07:40</i>
+<p>
+<h3>recommit for updates in build 65</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/62c755dcd38020c">62c755dcd38020c</a> Arne Teuke <i>2017-07-24 11:07:29</i>
+<p>
+<h3>fixed forwarding</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/0812a3559d254ee">0812a3559d254ee</a> Jenkins Server <i>2017-07-23 13:13:13</i>
 <p>
 <h3>recommit for updates in build 64</h3>

REPOSTRUCTURE.md

@@ -61,11 +61,11 @@
 |   |-- httpd
 |   |   |-- forward_conf.erb
 |   |   |-- index_html.erb
-|   |   |-- nagios_conf.erb
 |   |   `-- nagios_ssl_vhost.erb
 |   |-- nagios
 |   |   |-- cgi_cfg.erb
-|   |   `-- htpasswd_rule.erb
+|   |   |-- htpasswd_rule.erb
+|   |   `-- nagios_cfg.erb
 |   `-- selinux
 |       |-- statuscgi.erb
 |       `-- taccgi.erb

doc/_index.html

@@ -186,7 +186,7 @@
 </div>
 
       <div id="footer">
-  Generated on Mon Jul 24 13:07:34 2017 by
+  Generated on Mon Jul 24 17:04:14 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>

doc/file.README.html

@@ -140,16 +140,18 @@ install client binaries on clients</p>
 directories (filesystem permissions, selinux )
 * manage cgi.cfg through
 parameters
-* manage nagios users through external Puppet rules via define
+* manage nagios.cfg through parameters
-*
+* manage nagios users
-configure NRPE on clients (optional)
+through external Puppet rules via define
+* configure NRPE on clients
+(optional)
 * configure firewall (optional)
-*
+* configure selinux policies
-configure selinux policies (optional)
+(optional)
-* configure forwarding http to https
+* configure forwarding http to https including accesing the
-including accesing the /nagios url directly (optional)
+/nagios url directly (optional)
-* manage TLS
+* manage TLS certificates through certbot
-certificates through certbot (optional)</p>
+(optional)</p>
 
 <p>Service
 * manage Nagios service on server
@@ -231,12 +233,12 @@ Requires <a
 href="https://github.com/puppetlabs/puppetlabs-firewall">puppetlabs
 firewall</a> or <a
 href="https://gitlab.puppetsoft.com/12WW1160/cd_firewall">cd_firewall</a>,
-which is a clone of the puppetlabs firewall but tested to be fully
+which is a backdated clone of the puppetlabs firewall but tested to be
-functioning with all our features.</p>
+fully functioning with all our features.</p>
 </li></ul>
 
 <p>See the <a href="https://confdroid.com/2017/07/cd_nagios-parameters/">full
-list of all available parameters</a></p>
+list of all available parameters</a>.</p>
 
 <h3 id="label-PuppetDB">PuppetDB</h3>
 
@@ -331,7 +333,7 @@ environments.</p>
 </div></div>
 
       <div id="footer">
-  Generated on Mon Jul 24 13:07:36 2017 by
+  Generated on Mon Jul 24 17:04:16 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>

doc/index.html

@@ -140,16 +140,18 @@ install client binaries on clients</p>
 directories (filesystem permissions, selinux )
 * manage cgi.cfg through
 parameters
-* manage nagios users through external Puppet rules via define
+* manage nagios.cfg through parameters
-*
+* manage nagios users
-configure NRPE on clients (optional)
+through external Puppet rules via define
+* configure NRPE on clients
+(optional)
 * configure firewall (optional)
-*
+* configure selinux policies
-configure selinux policies (optional)
+(optional)
-* configure forwarding http to https
+* configure forwarding http to https including accesing the
-including accesing the /nagios url directly (optional)
+/nagios url directly (optional)
-* manage TLS
+* manage TLS certificates through certbot
-certificates through certbot (optional)</p>
+(optional)</p>
 
 <p>Service
 * manage Nagios service on server
@@ -231,12 +233,12 @@ Requires <a
 href="https://github.com/puppetlabs/puppetlabs-firewall">puppetlabs
 firewall</a> or <a
 href="https://gitlab.puppetsoft.com/12WW1160/cd_firewall">cd_firewall</a>,
-which is a clone of the puppetlabs firewall but tested to be fully
+which is a backdated clone of the puppetlabs firewall but tested to be
-functioning with all our features.</p>
+fully functioning with all our features.</p>
 </li></ul>
 
 <p>See the <a href="https://confdroid.com/2017/07/cd_nagios-parameters/">full
-list of all available parameters</a></p>
+list of all available parameters</a>.</p>
 
 <h3 id="label-PuppetDB">PuppetDB</h3>
 
@@ -331,7 +333,7 @@ environments.</p>
 </div></div>
 
       <div id="footer">
-  Generated on Mon Jul 24 13:07:35 2017 by
+  Generated on Mon Jul 24 17:04:15 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>

doc/puppet_classes/cd_nagios.html

@@ -139,7 +139,7 @@ class cd_nagios {
 </div>
 
       <div id="footer">
-  Generated on Mon Jul 24 13:07:36 2017 by
+  Generated on Mon Jul 24 17:04:16 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>

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 Mon Jul 24 13:07:38 2017 by
+  Generated on Mon Jul 24 17:04:19 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>

doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html

@@ -368,7 +368,7 @@ class cd_nagios::client::target (
 </div>
 
       <div id="footer">
-  Generated on Mon Jul 24 13:07:38 2017 by
+  Generated on Mon Jul 24 17:04:19 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>

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 Mon Jul 24 13:07:38 2017 by
+  Generated on Mon Jul 24 17:04:19 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>

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 Mon Jul 24 13:07:37 2017 by
+  Generated on Mon Jul 24 17:04:19 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>

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 Mon Jul 24 13:07:37 2017 by
+  Generated on Mon Jul 24 17:04:18 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>

doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html

@@ -235,7 +235,7 @@ class cd_nagios::main::install (
 </div>
 
       <div id="footer">
-  Generated on Mon Jul 24 13:07:37 2017 by
+  Generated on Mon Jul 24 17:04:19 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>

doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html

@@ -200,7 +200,7 @@ class cd_nagios::main::user (
 </div>
 
       <div id="footer">
-  Generated on Mon Jul 24 13:07:37 2017 by
+  Generated on Mon Jul 24 17:04:18 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>

doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html

@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
 </div>
 
       <div id="footer">
-  Generated on Mon Jul 24 13:07:38 2017 by
+  Generated on Mon Jul 24 17:04:19 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>

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 Mon Jul 24 13:07:38 2017 by
+  Generated on Mon Jul 24 17:04:19 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>

doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html

@@ -220,7 +220,12 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 111
 112
 113
-114</pre>
+114
+115
+116
+117
+118
+119</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/server/files.pp', line 23</span>
@@ -242,6 +247,20 @@ class cd_nagios::server::files (
 
     # manage nagios.cfg
 
+    file { $ng_nagios_cfg_file:
+      ensure    =&gt;  file,
+      path      =&gt;  $ng_nagios_cfg_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_nagios_cfg_erb),
+      notify    =&gt;  Service[$ng_service],
+    }
+
     # manage cgi.cfg
 
     file { $ng_cgi_cfg_file:
@@ -258,20 +277,11 @@ class cd_nagios::server::files (
       notify    =&gt;  Service[$ng_service],
     }
 
-    # manage nagios.conf for httpd
+    # since we use vhost files, we do not want the regular file to appear
+    # after upgrades to avoid conflicts
 
     file { $ng_nagios_conf:
       ensure    =&gt;  absent,
-#      path      =&gt;  $ng_nagios_conf,
-#      owner     =&gt;  &#39;root&#39;,
-#      group     =&gt;  &#39;root&#39;,
-#      mode      =&gt;  &#39;0644&#39;,
-#      selrange  =&gt;  s0,
-#      selrole   =&gt;  object_r,
-#      seltype   =&gt;  httpd_config_t,
-#      seluser   =&gt;  system_u,
-#      content   =&gt;  template($ng_nagios_conf_erb),
-#      notify    =&gt;  Service[$ae_service],
     }
 
     file { $ng_forward_conf:
@@ -324,7 +334,7 @@ class cd_nagios::server::files (
 </div>
 
       <div id="footer">
-  Generated on Mon Jul 24 13:07:38 2017 by
+  Generated on Mon Jul 24 17:04:19 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>

doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html

@@ -145,7 +145,53 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 36
 37
 38
-39</pre>
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/server/service.pp', line 23</span>
@@ -165,6 +211,52 @@ class cd_nagios::server::service (
       hasrestart  =&gt; true,
       enable      =&gt; true,
     }
+
+    @@nagios_service { &quot;check_nagios${::hostname}&quot;:
+        check_command       =&gt; &#39;check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios&#39;,
+        use                 =&gt; &#39;generic-service&#39;,
+        host_name           =&gt; $::fqdn,
+        notification_period =&gt; &#39;24x7&#39;,
+        target              =&gt;  $ng_target_service,
+        owner               =&gt; &#39;nagios&#39;,
+        group               =&gt; &#39;nagios&#39;,
+        mode                =&gt; &#39;660&#39;,
+        contacts            =&gt; &#39;DevOps&#39;,
+    }
+
+      resources { [ &#39;nagios_host&#39;,
+                    &#39;nagios_hostgroup&#39;,
+                    &#39;nagios_hostdependency&#39;,
+                    &#39;nagios_hostescalation&#39;,
+                    &#39;nagios_hostextinfo&#39;,
+                    &#39;nagios_service&#39;,
+                    &#39;nagios_servicegroup&#39;,
+                    &#39;nagios_servicedependency&#39;,
+                    &#39;nagios_serviceescalation&#39;,
+                    &#39;nagios_serviceextinfo&#39;,
+                    &#39;nagios_contact&#39;,
+                    &#39;nagios_contactgroup&#39;,
+                    &#39;nagios_command&#39;,
+                    &#39;nagios_timeperiod&#39; ]:
+        purge  =&gt; true,
+    }
+
+      # collect resources and populate /etc/nagios/conf.d/nagios_*.cfg
+      Nagios_host &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
+      Nagios_hostgroup &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
+      Nagios_hostdependency &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
+      Nagios_hostescalation &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
+      Nagios_hostextinfo &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
+      Nagios_service &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
+      Nagios_servicegroup &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
+      Nagios_servicedependency &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
+      Nagios_serviceescalation &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
+      Nagios_serviceextinfo &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
+      Nagios_contact &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
+      Nagios_contactgroup &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
+      Nagios_command &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
+      Nagios_timeperiod &lt;&lt;||&gt;&gt; { notify  =&gt; Service[&#39;nagios&#39;] }
+
   }
 }</pre>
       </td>
@@ -174,7 +266,7 @@ class cd_nagios::server::service (
 </div>
 
       <div id="footer">
-  Generated on Mon Jul 24 13:07:38 2017 by
+  Generated on Mon Jul 24 17:04:19 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>

doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html

@@ -220,7 +220,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 </div>
 
       <div id="footer">
-  Generated on Mon Jul 24 13:07:38 2017 by
+  Generated on Mon Jul 24 17:04:20 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>

doc/top-level-namespace.html

@@ -90,7 +90,7 @@
 </div>
 
       <div id="footer">
-  Generated on Mon Jul 24 13:07:36 2017 by
+  Generated on Mon Jul 24 17:04:16 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>

tests/UTF_Files

@@ -4,4 +4,5 @@
 ./.yardoc/objects/root.dat: data
 ./doc/css/style.css: HTML document, UTF-8 Unicode text, with very long lines
 ./doc/js/jquery.js: HTML document, UTF-8 Unicode text, with very long lines
+./doc/puppet_classes/cd_nagios_3A_3Aparams.html: HTML document, UTF-8 Unicode text
 ./templates/httpd/index_html.erb: empty