Recommit for updates in build 84

doc/_index.html

@@ -93,6 +93,11 @@
       
             </li>
     
+            <li>
+      <span class='object_link'><a href="puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aconfig.html" title="puppet_classes::confdroid_nagios::nagios::config (puppet_class)">confdroid_nagios::nagios::config</a></span>
+      
+            </li>
+    
             <li>
       <span class='object_link'><a href="puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html" title="puppet_classes::confdroid_nagios::nagios::objects::commands (puppet_class)">confdroid_nagios::nagios::objects::commands</a></span>
       

doc/puppet_class_list.html

@@ -75,49 +75,56 @@
     </li>
     
 
-    <li id="object_puppet_classes::confdroid_nagios::nagios::objects::commands" class="even">
+    <li id="object_puppet_classes::confdroid_nagios::nagios::config" class="even">
+      <div class="item">
+        <span class='object_link'><a href="puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aconfig.html" title="puppet_classes::confdroid_nagios::nagios::config (puppet_class)">confdroid_nagios::nagios::config</a></span>
+      </div>
+    </li>
+    
+
+    <li id="object_puppet_classes::confdroid_nagios::nagios::objects::commands" class="odd">
       <div class="item">
         <span class='object_link'><a href="puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html" title="puppet_classes::confdroid_nagios::nagios::objects::commands (puppet_class)">confdroid_nagios::nagios::objects::commands</a></span>
       </div>
     </li>
     
 
-    <li id="object_puppet_classes::confdroid_nagios::nagios::resources::resource" class="odd">
+    <li id="object_puppet_classes::confdroid_nagios::nagios::resources::resource" class="even">
       <div class="item">
         <span class='object_link'><a href="puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aresources_3A_3Aresource.html" title="puppet_classes::confdroid_nagios::nagios::resources::resource (puppet_class)">confdroid_nagios::nagios::resources::resource</a></span>
       </div>
     </li>
     
 
-    <li id="object_puppet_classes::confdroid_nagios::params" class="even">
+    <li id="object_puppet_classes::confdroid_nagios::params" class="odd">
       <div class="item">
         <span class='object_link'><a href="puppet_classes/confdroid_nagios_3A_3Aparams.html" title="puppet_classes::confdroid_nagios::params (puppet_class)">confdroid_nagios::params</a></span>
       </div>
     </li>
     
 
-    <li id="object_puppet_classes::confdroid_nagios::server::access_rules" class="odd">
+    <li id="object_puppet_classes::confdroid_nagios::server::access_rules" class="even">
       <div class="item">
         <span class='object_link'><a href="puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aaccess_rules.html" title="puppet_classes::confdroid_nagios::server::access_rules (puppet_class)">confdroid_nagios::server::access_rules</a></span>
       </div>
     </li>
     
 
-    <li id="object_puppet_classes::confdroid_nagios::server::files" class="even">
+    <li id="object_puppet_classes::confdroid_nagios::server::files" class="odd">
       <div class="item">
         <span class='object_link'><a href="puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html" title="puppet_classes::confdroid_nagios::server::files (puppet_class)">confdroid_nagios::server::files</a></span>
       </div>
     </li>
     
 
-    <li id="object_puppet_classes::confdroid_nagios::server::nagios" class="odd">
+    <li id="object_puppet_classes::confdroid_nagios::server::nagios" class="even">
       <div class="item">
         <span class='object_link'><a href="puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Anagios.html" title="puppet_classes::confdroid_nagios::server::nagios (puppet_class)">confdroid_nagios::server::nagios</a></span>
       </div>
     </li>
     
 
-    <li id="object_puppet_classes::confdroid_nagios::server::service" class="even">
+    <li id="object_puppet_classes::confdroid_nagios::server::service" class="odd">
       <div class="item">
         <span class='object_link'><a href="puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::confdroid_nagios::server::service (puppet_class)">confdroid_nagios::server::service</a></span>
       </div>

doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aconfig.html

@@ -0,0 +1,158 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>
+  Puppet Class: confdroid_nagios::nagios::config
+  
+    &mdash; Documentation by YARD 0.9.36
+  
+</title>
+
+  <link rel="stylesheet" href="../css/style.css" type="text/css" />
+
+  <link rel="stylesheet" href="../css/common.css" type="text/css" />
+
+<script type="text/javascript">
+  pathId = "puppet_classes::confdroid_nagios::nagios::config";
+  relpath = '../';
+</script>
+
+
+  <script type="text/javascript" charset="utf-8" src="../js/jquery.js"></script>
+
+  <script type="text/javascript" charset="utf-8" src="../js/app.js"></script>
+
+
+  </head>
+  <body>
+    <div class="nav_wrap">
+      <iframe id="nav" src="../puppet_class_list.html?1"></iframe>
+      <div id="resizer"></div>
+    </div>
+
+    <div id="main" tabindex="-1">
+      <div id="header">
+        <div id="menu">
+  
+    <a href="../_index.html">Index (c)</a> &raquo;
+    <span class='title'><span class='object_link'>Puppet Classes</span></span>
+     &raquo; 
+    <span class="title">confdroid_nagios::nagios::config</span>
+  
+</div>
+
+        <div id="search">
+  
+    <a class="full_list_link" id="puppet_class_list_link"
+        href="../puppet_class_list.html">
+
+        <svg width="24" height="24">
+          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
+        </svg>
+    </a>
+  
+</div>
+        <div class="clear"></div>
+      </div>
+
+      <div id="content"><h1>Puppet Class: confdroid_nagios::nagios::config</h1>
+<div class="box_info">
+  
+  <dl>
+    <dt>Inherits:</dt>
+    <dd><span class='object_link'><a href="confdroid_nagios_3A_3Aparams.html" title="puppet_classes::confdroid_nagios::params (puppet_class)">confdroid_nagios::params</a></span></dd>
+  </dl>
+  
+  
+  <dl>
+    <dt>Defined in:</dt>
+    <dd>
+      manifests/nagios/config.pp
+    </dd>
+  </dl>
+</div>
+
+  <h2>Summary</h2>
+  Class manages the nagios objects definitions.
+
+<h2>Overview</h2>
+<div class="docstring">
+  <div class="discussion">
+    
+<p>confdroid_nagios::server::nagios::config.pp Module name: confdroid_nagios Author: 12ww1160 (12ww1160@confdroid.com)</p>
+
+  </div>
+</div>
+
+
+
+<div class="tags">
+  
+
+
+</div><div class="method_details_list">
+  <table class="source_code">
+    <tr>
+      <td>
+        <pre class="lines">
+
+
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24</pre>
+      </td>
+      <td>
+        <pre class="code"><span class="info file"># File 'manifests/nagios/config.pp', line 6</span>
+
+class confdroid_nagios::nagios::config (
+
+) inherits confdroid_nagios::params {
+  if $ng_nagios_server == $fqdn {
+    require confdroid_nagios::nagios::objects::commands
+    #require confdroid_nagios::nagios::objects::template_rules
+    #require confdroid_nagios::nagios::objects::contacts
+    #require confdroid_nagios::nagios::objects::add_contact_rules
+    #require confdroid_nagios::nagios::objects::contactgroups
+    #require confdroid_nagios::nagios::objects::add_contactgroups_rules
+    #require confdroid_nagios::nagios::objects::hostgroups
+    #require confdroid_nagios::nagios::objects::add_hostgroup_rules
+    #require confdroid_nagios::nagios::objects::servicegroups
+    #require confdroid_nagios::nagios::objects::add_servicegroup_rules
+    #require confdroid_nagios::nagios::objects::timeperiods
+    #require confdroid_nagios::nagios::objects::add_timeperiod_rules
+    require confdroid_nagios::nagios::resources::resource
+  }
+}</pre>
+      </td>
+    </tr>
+  </table>
+</div>
+</div>
+
+      <div id="footer">
+     Generated by <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>.
+</div>
+
+    </div>
+  </body>
+</html>

doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html

@@ -322,7 +322,7 @@ and populates /etc/nagios/conf.d/nagios_commands.cfg.
 class confdroid_nagios::nagios::objects::commands (
 
 ) inherits confdroid_nagios::params {
-  if $fqdn == $ng_nagios_server {
+  if $ng_nagios_server == $fqdn {
     @@nagios_command { 'notify-host-by-email':
       ensure       => present,
       command_name => 'notify-host-by-email',

doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aresources_3A_3Aresource.html

@@ -160,7 +160,7 @@ ng_user_arg_comment => "Sets $USER1$ to be the path to the plugins"
 class confdroid_nagios::nagios::resources::resource (
 
 ) inherits confdroid_nagios::params {
-  if $fqdn == $ng_nagios_server {
+  if $ng_nagios_server == $fqdn {
     concat { $ng_resource_file:
       ensure   => present,
       owner    => 'root',

doc/puppet_classes/confdroid_nagios_3A_3Aparams.html

@@ -77,6 +77,8 @@
       
       <span class='object_link'><a href="confdroid_nagios_3A_3Aclient_3A_3Atarget.html" title="puppet_classes::confdroid_nagios::client::target (puppet_class)">confdroid_nagios::client::target</a></span><br/>
       
+      <span class='object_link'><a href="confdroid_nagios_3A_3Anagios_3A_3Aconfig.html" title="puppet_classes::confdroid_nagios::nagios::config (puppet_class)">confdroid_nagios::nagios::config</a></span><br/>
+      
       <span class='object_link'><a href="confdroid_nagios_3A_3Aserver_3A_3Anagios.html" title="puppet_classes::confdroid_nagios::server::nagios (puppet_class)">confdroid_nagios::server::nagios</a></span><br/>
       
       <span class='object_link'><a href="confdroid_nagios_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::confdroid_nagios::server::service (puppet_class)">confdroid_nagios::server::service</a></span><br/>

doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html

@@ -124,8 +124,7 @@
 26
 27
 28
-29
+29</pre>
-30</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/server/service.pp', line 6</span>
@@ -136,8 +135,7 @@ class confdroid_nagios::server::service (
   require confdroid_nagios::server::files
   if $ng_nagios_server == $fqdn {
     require confdroid_nagios::server::access_rules
-    require confdroid_nagios::nagios::resources::resource
+    require confdroid_nagios::nagios::config
-    require confdroid_nagios::nagios::objects::commands
 
     exec { &#39;ng_restart_httpd&#39;:
       command     =&gt; &#39;systemctl restart httpd&#39;,

doc/puppet_defined_types/confdroid_nagios_3A_3Anagios_3A_3Aresources_3A_3Aresource_df.html

@@ -206,7 +206,7 @@ define confdroid_nagios::nagios::resources::resource_df (
   $ng_resource_file = $confdroid_nagios::params::ng_resource_file
   $fqdn = $facts['networking']['fqdn']
 
-  if $fqdn == $ng_nagios_server {
+  if $ng_nagios_server == $fqdn {
     concat::fragment { "rule_${name}":
       target  => $ng_resource_file,
       content => template($ng_resource_rule_erb),