Recommit for updates in build 196

doc/puppet_classes/confdroid_nagios_3A_3Aclient_3A_3Atarget.html

@@ -218,7 +218,12 @@
 120
 121
 122
-123</pre>
+123
+124
+125
+126
+127
+128</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/client/target.pp', line 6</span>
@@ -231,6 +236,11 @@ class confdroid_nagios::client::target (
       ensure =&gt; $ng_pkg_ensure,
     }
 
+    # if we want to use NRPE on clients, install it
+    if $ng_include_nrpe == true {
+      require confdroid_nrpe
+    }
+
     @@nagios_host { $fqdn:
       ensure              =&gt; $ng_ping_ensure,
       alias               =&gt; $hostname,

doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Ainstall.html

@@ -123,8 +123,7 @@
 25
 26
 27
-28
-29</pre>
+28</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/install.pp', line 6</span>
@@ -142,15 +141,14 @@ class confdroid_nagios::main::install (
     package { $ng_reqpackages_server:
       ensure =&gt; $ng_pkg_ensure,
     }
-  }
 
-  package { $ng_reqpackages_client:
-    ensure =&gt; $ng_pkg_ensure,
-  }
+    package { $ng_reqpackages_client:
+      ensure =&gt; $ng_pkg_ensure,
+    }
 
-  # if we want to use NRPE on clients, install it
-  if $ng_include_nrpe == true {
-    require confdroid_nrpe
+    if $ng_include_nrpe == true {
+      require confdroid_nrpe
+    }
   }
 }</pre>
       </td>

doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Anagios.html

@@ -217,8 +217,7 @@
 119
 120
 121
-122
-123</pre>
+122</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/server/nagios.pp', line 6</span>
@@ -227,7 +226,6 @@ class confdroid_nagios::server::nagios (
 
 ) inherits confdroid_nagios::params {
   if $ng_nagios_server == $fqdn {
-
     @@nagios_service { &#39;check_nagios_localhost&#39;:
       check_command       =&gt; &quot;check_nagios!${ng_spool_dir}/status.dat!5!/usr/sbin/nagios&quot;,
       use                 =&gt; &#39;generic-service&#39;,