Recommit for updates in build 78

doc/_index.html

@@ -93,6 +93,11 @@
       
             </li>
     
+            <li>
+      <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>
+      
+            </li>
+    
             <li>
       <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>
       
@@ -139,6 +144,11 @@
         <li class="letter">C</li>
           <ul>
     
+            <li>
+      <span class='object_link'><a href="puppet_defined_types/confdroid_nagios_3A_3Anagios_3A_3Aresources_3A_3Aresource_df.html" title="puppet_defined_types::confdroid_nagios::nagios::resources::resource_df (puppet_defined_type)">confdroid_nagios::nagios::resources::resource_df</a></span>
+      
+            </li>
+    
             <li>
       <span class='object_link'><a href="puppet_defined_types/confdroid_nagios_3A_3Aserver_3A_3Aaccess.html" title="puppet_defined_types::confdroid_nagios::server::access (puppet_defined_type)">confdroid_nagios::server::access</a></span>
       

doc/puppet_class_list.html

@@ -75,35 +75,42 @@
     </li>
     
 
-    <li id="object_puppet_classes::confdroid_nagios::params" class="even">
+    <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="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_3Amain_3A_3Aconfig.html

@@ -106,7 +106,11 @@
 8
 9
 10
-11</pre>
+11
+12
+13
+14
+15</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/config.pp', line 6</span>
@@ -114,7 +118,11 @@
 class confdroid_nagios::main::config (
 
 ) inherits confdroid_nagios::params {
-  include confdroid_nagios::server::service
+  if $fqdn == $ng_nagios_server {
+    include confdroid_nagios::server::service
+    include confdroid_nagios::nagios::resources::resource
+  }
+
   include confdroid_nagios::client::target
 }</pre>
       </td>

doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aresources_3A_3Aresource.html

@@ -0,0 +1,210 @@
+<!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::resources::resource
+  
+    &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::resources::resource";
+  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::resources::resource</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::resources::resource</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/resources/resource.pp
+    </dd>
+  </dl>
+</div>
+
+  <h2>Summary</h2>
+  Class manages the resource config file header.
+
+<h2>Overview</h2>
+<div class="docstring">
+  <div class="discussion">
+    
+<p>confdroid_nagios::nagios::resources::resource.pp Module name: confdroid_nagios Author: 12ww1160 (12ww1160@confdroid.com)  }</p>
+
+  </div>
+</div>
+
+
+
+<div class="tags">
+  
+  <div class="examples">
+    <p class="tag_title">Examples:</p>
+    
+      
+        <p class="example_title"><div class='inline'>
+<p>concat::fragment { “user_rule_plugins”:</p>
+</div></p>
+      
+      <pre class="example code"><code>ng_user_arg_name    =&gt; &quot;$user1$&quot;,
+ng_user_arg_value   =&gt; &#39;/usr/lib64/nagios/plugins&#39;,
+ng_user_arg_comment =&gt; &quot;Sets $USER1$ to be the path to the plugins&quot;,</code></pre>
+    
+  </div>
+
+
+
+</div><div class="method_details_list">
+  <table class="source_code">
+    <tr>
+      <td>
+        <pre class="lines">
+
+
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48</pre>
+      </td>
+      <td>
+        <pre class="code"><span class="info file"># File 'manifests/nagios/resources/resource.pp', line 11</span>
+
+class confdroid_nagios::nagios::resources::resource (
+
+) inherits confdroid_nagios::params {
+  if $fqdn == $ng_nagios_server {
+    concat { $ng_resource_file:
+      ensure   =&gt; present,
+      owner    =&gt; &#39;root&#39;,
+      group    =&gt; $ng_user,
+      mode     =&gt; &#39;0640&#39;,
+      selrange =&gt; s0,
+      selrole  =&gt; object_r,
+      seltype  =&gt; nagios_etc_t,
+      seluser  =&gt; system_u,
+      notify   =&gt; Service[$ng_service],
+    }
+
+    concat::fragment { &#39;header&#39;:
+      target  =&gt; $ng_resource_file,
+      content =&gt; template($ng_resource_erb),
+      order   =&gt; &#39;000&#39;,
+    }
+
+    # plugins rule
+
+    confdroid_nagios::nagios::resources::resource_df { &#39;user_rule_plugins&#39;:
+      ng_user_arg_name    =&gt; &#39;USER1&#39;,
+      ng_user_arg_value   =&gt; &#39;/usr/lib64/nagios/plugins/&#39;,
+      ng_user_arg_comment =&gt; &#39;Sets user1 to be the path to the plugins&#39;,
+    }
+
+    # eventhandlers rule
+    confdroid_nagios::nagios::resources::resource_df { &#39;user_rule_eventhandlers&#39;:
+      ng_user_arg_name    =&gt; &#39;USER2&#39;,
+      ng_user_arg_value   =&gt; &#39;/usr/lib64/nagios/plugins/eventhandlers/&#39;,
+      ng_user_arg_comment =&gt; &#39;Sets user2 to be the path to the eventhandlers&#39;,
+    }
+  }
+}</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_3Aparams.html

@@ -83,6 +83,8 @@
       
       <span class='object_link'><a href="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><br/>
       
+      <span class='object_link'><a href="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><br/>
+      
     </dd>
   </dl>
   
@@ -417,7 +419,8 @@ inherited by all classes except defines.
 141
 142
 143
-144</pre>
+144
+145</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/params.pp', line 31</span>
@@ -507,6 +510,8 @@ class confdroid_nagios::params (
   $ng_htpasswd_file           = &quot;${ng_main_dir}/passwd&quot;
   $ng_htpasswd_head           = &#39;confdroid_nagios/nagios/htpasswd_head.erb&#39;
   $ng_htpasswd_rule           = &#39;confdroid_nagios/nagios/htpasswd_rule.erb&#39;
+  $ng_resource_file           = &#39;/etc/nagios/private/resource.cfg&#39;
+  $ng_resource_erb            = &#39;confdroid_nagios/nagios/resource_cfg.erb&#39;
 
 ## old
   $ng_main_config             = &quot;${ng_main_dir}/nagios.cfg&quot;
@@ -530,7 +535,6 @@ class confdroid_nagios::params (
   $ng_index_html_erb          = &#39;confdroid_nagios/httpd/index_html.erb&#39;
   $ng_ssl_vhost_file          = &#39;/etc/httpd/conf.d/nagios_ssl.conf&#39;
   $ng_ssl_vhost_erb           = &#39;confdroid_nagios/httpd/nagios_ssl_vhost.erb&#39;
-  $ng_resource_erb            = &#39;confdroid_nagios/nagios/resource_cfg.erb&#39;
   $ng_grep_erb                = &#39;confdroid_nagios/selinux/grep.erb&#39;
 
 # includes must be last

doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html

@@ -122,7 +122,8 @@
 24
 25
 26
-27</pre>
+27
+28</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/server/service.pp', line 6</span>
@@ -133,6 +134,7 @@ class confdroid_nagios::server::service (
   require confdroid_nagios::server::files
   if $ng_nagios_server == $fqdn {
     require confdroid_nagios::server::access_rules
+
     exec { &#39;restart_httpd&#39;:
       command     =&gt; &#39;systemctl restart httpd&#39;,
       path        =&gt; [&#39;/bin&#39;, &#39;/usr/bin&#39;, &#39;/sbin&#39;, &#39;/usr/sbin&#39;],

doc/puppet_defined_type_list.html

@@ -40,7 +40,14 @@
       <ul id="full_list" class="puppet_defined_type">
         
 
-    <li id="object_puppet_defined_types::confdroid_nagios::server::access" class="odd">
+    <li id="object_puppet_defined_types::confdroid_nagios::nagios::resources::resource_df" class="odd">
+      <div class="item">
+        <span class='object_link'><a href="puppet_defined_types/confdroid_nagios_3A_3Anagios_3A_3Aresources_3A_3Aresource_df.html" title="puppet_defined_types::confdroid_nagios::nagios::resources::resource_df (puppet_defined_type)">confdroid_nagios::nagios::resources::resource_df</a></span>
+      </div>
+    </li>
+    
+
+    <li id="object_puppet_defined_types::confdroid_nagios::server::access" class="even">
       <div class="item">
         <span class='object_link'><a href="puppet_defined_types/confdroid_nagios_3A_3Aserver_3A_3Aaccess.html" title="puppet_defined_types::confdroid_nagios::server::access (puppet_defined_type)">confdroid_nagios::server::access</a></span>
       </div>

doc/puppet_defined_types/confdroid_nagios_3A_3Anagios_3A_3Aresources_3A_3Aresource_df.html

@@ -0,0 +1,227 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>
+  Defined Type: confdroid_nagios::nagios::resources::resource_df
+  
+    &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_defined_types::confdroid_nagios::nagios::resources::resource_df";
+  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_defined_type_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'>Defined Types</span></span>
+     &raquo; 
+    <span class="title">confdroid_nagios::nagios::resources::resource_df</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>Defined Type: confdroid_nagios::nagios::resources::resource_df</h1>
+<div class="box_info">
+  <dl>
+    <dt>Defined in:</dt>
+    <dd>
+      manifests/nagios/resources/resource_df.pp
+    </dd>
+  </dl>
+</div>
+
+  <h2>Summary</h2>
+  define manages the resources in/etc/nagios/private/resources.cfg
+
+<h2>Overview</h2>
+<div class="docstring">
+  <div class="discussion">
+    
+<p>confdroid_nagios::nagios::resources::resource_df.pp Module name: confdroid_nagios Author: 12ww1160 (12ww1160@ConfDroid.com)</p>
+
+  </div>
+</div>
+
+
+
+<div class="tags">
+  <p class="tag_title">Parameters:</p>
+<ul class="param">
+  
+    <li>
+      
+        <span class='name'>ng_user_arg_name</span>
+      
+      
+        <span class='type'>(<tt>Optional[String]</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>undef</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>the name of user argument i.e. $user1$</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_user_arg_value</span>
+      
+      
+        <span class='type'>(<tt>Optional[String]</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>undef</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>the value of t user argument i.e. $user1$</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_user_arg_comment</span>
+      
+      
+        <span class='type'>(<tt>Optional[String]</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>undef</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>the argument i.e. $user1$</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_resource_rule_erb</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;confdroid_nagios/nagios/resource_cfg_rule.erb&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>resource rule #</p>
+</div>
+      
+    </li>
+  
+</ul>
+
+
+
+</div><div class="method_details_list">
+  <table class="source_code">
+    <tr>
+      <td>
+        <pre class="lines">
+
+
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28</pre>
+      </td>
+      <td>
+        <pre class="code"><span class="info file"># File 'manifests/nagios/resources/resource_df.pp', line 10</span>
+
+define confdroid_nagios::nagios::resources::resource_df (
+
+  Optional[String] $ng_user_arg_name     = undef,
+  Optional[String] $ng_user_arg_value    = undef,
+  Optional[String] $ng_user_arg_comment  = undef,
+  String $ng_resource_rule_erb           = &#39;confdroid_nagios/nagios/resource_cfg_rule.erb&#39;,
+
+) {
+  $ng_nagios_server = $confdroid_nagios::params::ng_nagios_server
+  $ng_resource_file = $confdroid_nagios::params::ng_resource_file
+
+  if $fqdn == $ng_nagios_server {
+    concat::fragment { &quot;rule_${name}&quot;:
+      target  =&gt; $ng_resource_file,
+      content =&gt; template($ng_resource_rule_erb),
+      order   =&gt; &#39;000&#39;,
+    }
+  }
+}</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_defined_types/confdroid_nagios_3A_3Aserver_3A_3Aaccess.html

@@ -161,8 +161,7 @@
 26
 27
 28
-29
+29</pre>
-30</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/server/access.pp', line 13</span>
@@ -178,7 +177,6 @@ define confdroid_nagios::server::access (
 
   if $fqdn == $ng_nagios_server {
     # create password rules
-
     concat::fragment { $name:
       target  =&gt; $ng_htpasswd_file,
       content =&gt; template($ng_htpasswd_rule),