Recommit for updates in build 6

doc/_index.html

@@ -98,11 +98,6 @@
       
             </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>
-      
-            </li>
-    
             <li>
       <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>
       

doc/file.README.html

@@ -59,6 +59,8 @@
 
       <div id="content"><div id='filecontents'>
 <h1 id="label-Readme">Readme</h1>
+
+<p><a href="https://jenkins.confdroid.com/job/confdroid_nrpe/"><img src="https://jenkins.confdroid.com/job/confdroid_nrpe/badge/icon?style=plastic"></a> <a href="https://sonarqube.confdroid.com/dashboard?id=confdroid_nagios"><img src="https://sonarqube.confdroid.com/api/project_badges/measure?project=confdroid_nagios&amp;metric=security_hotspots&amp;token=sqb_927c2cd1f1b90805cde962af0f5eda9ec936eb6f"></a></p>
 <ul><li>
 <p><a href="#readme">Readme</a></p>
 </li><li>
@@ -158,8 +160,11 @@
 </li></ul>
 
 <h2 id="label-Contact+Us">Contact Us</h2>
-
-<p><a href="https://confdroid.com/contact/">contact Us</a> <a href="https://feedback.confdroid.com/">Feedback portal</a></p>
+<ul><li>
+<p><a href="https://confdroid.com/contact/">contact Us</a></p>
+</li><li>
+<p><a href="https://feedback.confdroid.com/">Feedback Portal</a></p>
+</li></ul>
 
 <h2 id="label-Disclaimer">Disclaimer</h2>
 

doc/index.html

@@ -59,6 +59,8 @@
 
       <div id="content"><div id='filecontents'>
 <h1 id="label-Readme">Readme</h1>
+
+<p><a href="https://jenkins.confdroid.com/job/confdroid_nrpe/"><img src="https://jenkins.confdroid.com/job/confdroid_nrpe/badge/icon?style=plastic"></a> <a href="https://sonarqube.confdroid.com/dashboard?id=confdroid_nagios"><img src="https://sonarqube.confdroid.com/api/project_badges/measure?project=confdroid_nagios&amp;metric=security_hotspots&amp;token=sqb_927c2cd1f1b90805cde962af0f5eda9ec936eb6f"></a></p>
 <ul><li>
 <p><a href="#readme">Readme</a></p>
 </li><li>
@@ -158,8 +160,11 @@
 </li></ul>
 
 <h2 id="label-Contact+Us">Contact Us</h2>
-
-<p><a href="https://confdroid.com/contact/">contact Us</a> <a href="https://feedback.confdroid.com/">Feedback portal</a></p>
+<ul><li>
+<p><a href="https://confdroid.com/contact/">contact Us</a></p>
+</li><li>
+<p><a href="https://feedback.confdroid.com/">Feedback Portal</a></p>
+</li></ul>
 
 <h2 id="label-Disclaimer">Disclaimer</h2>
 

doc/puppet_class_list.html

@@ -78,21 +78,14 @@
     </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::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::service" class="odd">
+    <li id="object_puppet_classes::confdroid_nagios::server::service" class="even">
       <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_3Aclient_3A_3Atarget.html

@@ -64,7 +64,7 @@
   
   <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>
+    <dd>confdroid_nagios::params</dd>
   </dl>
   
   

doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Aconfig.html

@@ -64,7 +64,7 @@
   
   <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>
+    <dd>confdroid_nagios::params</dd>
   </dl>
   
   

doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Adirs.html

@@ -64,7 +64,7 @@
   
   <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>
+    <dd>confdroid_nagios::params</dd>
   </dl>
   
   

doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Ainstall.html

@@ -64,7 +64,7 @@
   
   <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>
+    <dd>confdroid_nagios::params</dd>
   </dl>
   
   
@@ -77,7 +77,7 @@
 </div>
 
   <h2>Summary</h2>
-  Class manaages main configuration for the confdroid_nagios module.
+  Class manages main configuration for the confdroid_nagios module.
 
 <h2>Overview</h2>
 <div class="docstring">
@@ -107,7 +107,20 @@
 9
 10
 11
-12</pre>
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/install.pp', line 6</span>
@@ -116,7 +129,20 @@ class confdroid_nagios::main::install (
 
 ) inherits confdroid_nagios::params {
   if $ng_nagios_server == $fqdn {
-    #config here
+    require confdroid_resources
+    # if our FQDN matches the configured Nagios server FQDN, install both server-
+    # and client packages.
+    if $fqdn == $ng_nagios_server {
+      # we&#39;ll need httpd installed
+      require confdroid_apache
+
+      package {$ng_reqpackages_server:
+        ensure =&gt; $ng_pkg_ensure,
+      }
+      package {$ng_reqpackages_client:
+        ensure =&gt; $ng_pkg_ensure,
+      }
+    }
   }
 }</pre>
       </td>

doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Auser.html

@@ -64,7 +64,7 @@
   
   <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>
+    <dd>confdroid_nagios::params</dd>
   </dl>
   
   

doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html

@@ -64,7 +64,7 @@
   
   <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>
+    <dd>confdroid_nagios::params</dd>
   </dl>
   
   

doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html

@@ -64,7 +64,7 @@
   
   <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>
+    <dd>confdroid_nagios::params</dd>
   </dl>