Merge branch 'jenkins' into 'master'

Jenkins

See merge request !60

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/699586d7d8b5253">699586d7d8b5253</a> Jenkins Server <i>2017-07-27 10:56:34</i>
+<p>
+<h3>recommit for updates in build 109</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/672f61d994a4360">672f61d994a4360</a> Arne Teuke <i>2017-07-27 10:56:09</i>
+<p>
+<h3>added and linked add_contactgroups_rules</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/2b24ed69186142a">2b24ed69186142a</a> Jenkins Server <i>2017-07-27 10:41:48</i>
 <p>
 <h3>recommit for updates in build 108</h3>

doc/_index.html

@@ -236,7 +236,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Jul 27 12:56:24 2017 by
+  Generated on Thu Jul 27 12:59:58 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

@@ -355,7 +355,7 @@ environments.</p>
 </div></div>
 
       <div id="footer">
-  Generated on Thu Jul 27 12:56:25 2017 by
+  Generated on Thu Jul 27 12:59: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>

doc/index.html

@@ -355,7 +355,7 @@ environments.</p>
 </div></div>
 
       <div id="footer">
-  Generated on Thu Jul 27 12:56:25 2017 by
+  Generated on Thu Jul 27 12:59: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>

doc/puppet_classes/cd_nagios.html

@@ -139,7 +139,7 @@ class cd_nagios {
 </div>
 
       <div id="footer">
-  Generated on Thu Jul 27 12:56:26 2017 by
+  Generated on Thu Jul 27 13:00: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>

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 12:56:30 2017 by
+  Generated on Thu Jul 27 13:00:04 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 Thu Jul 27 12:56:30 2017 by
+  Generated on Thu Jul 27 13:00:04 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 Thu Jul 27 12:56:30 2017 by
+  Generated on Thu Jul 27 13:00:04 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 Thu Jul 27 12:56:29 2017 by
+  Generated on Thu Jul 27 13:00:04 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 Thu Jul 27 12:56:29 2017 by
+  Generated on Thu Jul 27 13:00:03 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 Thu Jul 27 12:56:30 2017 by
+  Generated on Thu Jul 27 13:00:04 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 Thu Jul 27 12:56:29 2017 by
+  Generated on Thu Jul 27 13:00:04 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_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 12:56:31 2017 by
+  Generated on Thu Jul 27 13:00:05 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_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 12:56:31 2017 by
+  Generated on Thu Jul 27 13:00:05 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_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 12:56:30 2017 by
+  Generated on Thu Jul 27 13:00:05 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_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 12:56:30 2017 by
+  Generated on Thu Jul 27 13:00:05 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_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 12:56:31 2017 by
+  Generated on Thu Jul 27 13:00:05 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_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 12:56:30 2017 by
+  Generated on Thu Jul 27 13:00:05 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_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 12:56:31 2017 by
+  Generated on Thu Jul 27 13:00:05 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_3Aparams.html

@@ -5579,7 +5579,7 @@ $ng_target_command        = "${ng_conf_d_dir}/nagios_command.cfg"
 </div>
 
       <div id="footer">
-  Generated on Thu Jul 27 12:56:29 2017 by
+  Generated on Thu Jul 27 13:00:03 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 Thu Jul 27 12:56:30 2017 by
+  Generated on Thu Jul 27 13:00:04 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 Thu Jul 27 12:56:30 2017 by
+  Generated on Thu Jul 27 13:00:04 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

@@ -334,7 +334,7 @@ class cd_nagios::server::files (
 </div>
 
       <div id="footer">
-  Generated on Thu Jul 27 12:56:30 2017 by
+  Generated on Thu Jul 27 13:00:04 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

@@ -268,7 +268,7 @@ class cd_nagios::server::service (
 </div>
 
       <div id="footer">
-  Generated on Thu Jul 27 12:56:30 2017 by
+  Generated on Thu Jul 27 13:00:04 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_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 12:56:32 2017 by
+  Generated on Thu Jul 27 13:00:06 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_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html

@@ -185,7 +185,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/</p>
 40
 41
 42
-43</pre>
+43
+44</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/nagios/objects/add_contactgroups.pp', line 24</span>
@@ -200,6 +201,7 @@ $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
 
 
   if $::fqdn == $ng_nagios_server {
@@ -217,7 +219,7 @@ $ng_tgt_contactgroup_add  = $::cd_nagios::params::ng_tgt_contactgroup_add
 </div>
 
       <div id="footer">
-  Generated on Thu Jul 27 12:56:32 2017 by
+  Generated on Thu Jul 27 13:00:06 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_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 12:56:32 2017 by
+  Generated on Thu Jul 27 13:00:06 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 Thu Jul 27 12:56:31 2017 by
+  Generated on Thu Jul 27 13:00:05 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 Thu Jul 27 12:56:26 2017 by
+  Generated on Thu Jul 27 12:59: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>

manifests/nagios/objects/add_contactgroups.pp

@@ -31,6 +31,7 @@ $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
 
 
   if $::fqdn == $ng_nagios_server {