Recommit for updates in build 16

doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Ainstall.html

@@ -129,7 +129,8 @@
 31
 32
 33
-34</pre>
+34
+35</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/install.pp', line 6</span>
@@ -137,8 +138,9 @@
 class confdroid_nagios::main::install (
 
 ) inherits confdroid_nagios::params {
+  require confdroid_resources
+
   if $ng_nagios_server == $fqdn {
-    require confdroid_resources
     # if our FQDN matches the configured Nagios server FQDN, install both server-
     # and client packages.We&#39;ll need httpd installed
     require confdroid_apache
@@ -153,8 +155,8 @@ class confdroid_nagios::main::install (
 
   # if we are not the nagios server, install only client packages
   if $fqdn != $ng_nagios_server {
-    package { $reqpackages_client:
-      ensure =&gt; $pkg_ensure,
+    package { $ng_reqpackages_client:
+      ensure =&gt; $ng_pkg_ensure,
     }
 
     # if we want to use NRPE on clients, install it