OP#421 restructure

manifests/main/install.pp

@@ -6,8 +6,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'll need httpd installed
     require confdroid_apache
@@ -22,8 +23,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 => $pkg_ensure,
+    package { $ng_reqpackages_client:
+      ensure => $ng_pkg_ensure,
     }
 
     # if we want to use NRPE on clients, install it