Merge branch 'jenkins' into 'master'

Jenkins See merge request !61
2017-07-27 13:15:44 +02:00
parent 443b8f464e d6267355c6
commit eabe403734
31 changed files with 58 additions and 32 deletions
--- a/CHANGELOG.md
+++ b/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/14a1e7412ff6792">14a1e7412ff6792</a> Jenkins Server <i>2017-07-27 11:00:10</i>
+<p>
+<h3>recommit for updates in build 110</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/a90da5d3ed18e7a">a90da5d3ed18e7a</a> Arne Teuke <i>2017-07-27 10:59:39</i>
+<p>
+<h3>added and linked add_contactgroups_rules</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/699586d7d8b5253">699586d7d8b5253</a> Jenkins Server <i>2017-07-27 10:56:34</i>
 <p>
 <h3>recommit for updates in build 109</h3>
--- a/README.md
+++ b/README.md
@@ -24,6 +24,8 @@ Nagios is a powerful open source software solution for monitoring your IT enviro
 * [PuppetDB]
 * [SELINUX](#selinux)
 * [Certbot](#certbot)
+* [Httpd vHost Files](#httpd-vhost-files)
+* [Manage additional resources]
 * [Known Problems](#known-problems)
 * [Support](#support)
 * [Tests](#tests)
@@ -120,6 +122,8 @@ If you prefer to use https but use self-signed certs or your own CA, simply set
 ### httpd vHost files
 by Default, Nagios creates its own nagios.conf file, which is not a vhost file and relies on the main ssd.conf. However, as Nagios might be running on a regular web server with various other web instances (not recommended through for performance reasons), we will not want to manage ssl.conf directly, hence the module creates a vhost for the ssl host.

+### Manage additional resources
+
 ### Known Problems

 ### Support
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -236,7 +236,7 @@
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 12:59:58 2017 by
+  Generated on Thu Jul 27 13:11:44 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/file.README.html
+++ b/doc/file.README.html
@@ -112,6 +112,10 @@ Structure</a></p>
 </li><li>
 <p><a href="#certbot">Certbot</a></p>
 </li><li>
+<p><a href="#httpd-vhost-files">Httpd vHost Files</a></p>
+</li><li>
+<p>[Manage additional resources]</p>
+</li><li>
 <p><a href="#known-problems">Known Problems</a></p>
 </li><li>
 <p><a href="#support">Support</a></p>
@@ -296,6 +300,8 @@ on a regular web server with various other web instances (not recommended
 through for performance reasons), we will not want to manage ssl.conf
 directly, hence the module creates a vhost for the ssl host.</p>

+<h3 id="label-Manage+additional+resources">Manage additional resources</h3>
+
 <h3 id="label-Known+Problems">Known Problems</h3>

 <h3 id="label-Support">Support</h3>
@@ -355,7 +361,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Thu Jul 27 12:59:59 2017 by
+  Generated on Thu Jul 27 13:11:46 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/index.html
+++ b/doc/index.html
@@ -112,6 +112,10 @@ Structure</a></p>
 </li><li>
 <p><a href="#certbot">Certbot</a></p>
 </li><li>
+<p><a href="#httpd-vhost-files">Httpd vHost Files</a></p>
+</li><li>
+<p>[Manage additional resources]</p>
+</li><li>
 <p><a href="#known-problems">Known Problems</a></p>
 </li><li>
 <p><a href="#support">Support</a></p>
@@ -296,6 +300,8 @@ on a regular web server with various other web instances (not recommended
 through for performance reasons), we will not want to manage ssl.conf
 directly, hence the module creates a vhost for the ssl host.</p>

+<h3 id="label-Manage+additional+resources">Manage additional resources</h3>
+
 <h3 id="label-Known+Problems">Known Problems</h3>

 <h3 id="label-Support">Support</h3>
@@ -355,7 +361,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Thu Jul 27 12:59:59 2017 by
+  Generated on Thu Jul 27 13:11:45 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.html
+++ b/doc/puppet_classes/cd_nagios.html
@@ -139,7 +139,7 @@ class cd_nagios {
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 13:00:00 2017 by
+  Generated on Thu Jul 27 13:11:46 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 Thu Jul 27 13:00:04 2017 by
+  Generated on Thu Jul 27 13:11:51 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
@@ -368,7 +368,7 @@ class cd_nagios::client::target (
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 13:00:04 2017 by
+  Generated on Thu Jul 27 13:11:51 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 Thu Jul 27 13:00:04 2017 by
+  Generated on Thu Jul 27 13:11:52 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 Thu Jul 27 13:00:04 2017 by
+  Generated on Thu Jul 27 13:11:51 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 Thu Jul 27 13:00:03 2017 by
+  Generated on Thu Jul 27 13:11:50 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
@@ -235,7 +235,7 @@ class cd_nagios::main::install (
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 13:00:04 2017 by
+  Generated on Thu Jul 27 13:11:51 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
@@ -200,7 +200,7 @@ class cd_nagios::main::user (
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 13:00:04 2017 by
+  Generated on Thu Jul 27 13:11:51 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
@@ -210,7 +210,7 @@ class cd_nagios::nagios::objects::add_contact_rules (
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 13:00:05 2017 by
+  Generated on Thu Jul 27 13:11:52 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
@@ -227,7 +227,7 @@ class cd_nagios::nagios::objects::add_contactgroups_rules (
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 13:00:05 2017 by
+  Generated on Thu Jul 27 13:11:52 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
@@ -595,7 +595,7 @@ class cd_nagios::nagios::objects::commands (
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 13:00:05 2017 by
+  Generated on Thu Jul 27 13:11:52 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
@@ -170,7 +170,7 @@ class cd_nagios::nagios::objects::config (
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 13:00:05 2017 by
+  Generated on Thu Jul 27 13:11:52 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 Thu Jul 27 13:00:05 2017 by
+  Generated on Thu Jul 27 13:11:52 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 Thu Jul 27 13:00:05 2017 by
+  Generated on Thu Jul 27 13:11:52 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 Thu Jul 27 13:00:05 2017 by
+  Generated on Thu Jul 27 13:11:52 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
@@ -5579,7 +5579,7 @@ $ng_target_command        = &quot;${ng_conf_d_dir}/nagios_command.cfg&quot;
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 13:00:03 2017 by
+  Generated on Thu Jul 27 13:11:50 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
@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 13:00:04 2017 by
+  Generated on Thu Jul 27 13:11:51 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 Thu Jul 27 13:00:04 2017 by
+  Generated on Thu Jul 27 13:11:52 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 Thu Jul 27 13:00:04 2017 by
+  Generated on Thu Jul 27 13:11:51 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
@@ -268,7 +268,7 @@ class cd_nagios::server::service (
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 13:00:04 2017 by
+  Generated on Thu Jul 27 13:11:51 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_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html
@@ -247,7 +247,7 @@ $ng_contacts_rule_erb   = $::cd_nagios::params::ng_contacts_rule_erb
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 13:00:06 2017 by
+  Generated on Thu Jul 27 13:11:53 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_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html
@@ -201,14 +201,14 @@ $ng_contactgroup_register = &#39;1&#39;,

 $ng_nagios_server         = $::cd_nagios::params::ng_nagios_server
 $ng_tgt_contactgroup_add  = $::cd_nagios::params::ng_tgt_contactgroup_add
-$ng_contacts_rule_erb     = $::cd_nagios::params::ng_contacts_rule_erb
+$ng_cntctgrps_rule_erb    = $::cd_nagios::params::ng_cntctgrps_rule_erb


  if $::fqdn == $ng_nagios_server {

    concat::fragment { $name:
      target    =&gt;  $ng_tgt_contactgroup_add,
-      content   =&gt;  template($ng_contacts_rule_erb),
+      content   =&gt;  template($ng_cntctgrps_rule_erb),
    }
  }
 }</pre>
@@ -219,7 +219,7 @@ $ng_contacts_rule_erb     = $::cd_nagios::params::ng_contacts_rule_erb
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 13:00:06 2017 by
+  Generated on Thu Jul 27 13:11:53 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_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html
@@ -935,7 +935,7 @@ $ng_templates_rule_erb  = $::cd_nagios::params::ng_templates_rule_erb
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 13:00:06 2017 by
+  Generated on Thu Jul 27 13:11:53 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_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
+++ b/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 Thu Jul 27 13:00:05 2017 by
+  Generated on Thu Jul 27 13:11:52 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/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 </div>

      <div id="footer">
-  Generated on Thu Jul 27 12:59:59 2017 by
+  Generated on Thu Jul 27 13:11:46 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/manifests/nagios/objects/add_contactgroups.pp
+++ b/manifests/nagios/objects/add_contactgroups.pp
@@ -31,14 +31,14 @@ $ng_contactgroup_register = '1',

 $ng_nagios_server         = $::cd_nagios::params::ng_nagios_server
 $ng_tgt_contactgroup_add  = $::cd_nagios::params::ng_tgt_contactgroup_add
-$ng_contacts_rule_erb     = $::cd_nagios::params::ng_contacts_rule_erb
+$ng_cntctgrps_rule_erb    = $::cd_nagios::params::ng_cntctgrps_rule_erb


  if $::fqdn == $ng_nagios_server {

    concat::fragment { $name:
      target    =>  $ng_tgt_contactgroup_add,
-      content   =>  template($ng_contacts_rule_erb),
+      content   =>  template($ng_cntctgrps_rule_erb),
    }
  }
 }