Recommit for updates in build 15

doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Aconfig.html

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

doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Auser.html

@@ -127,7 +127,8 @@
 29
 30
 31
-32</pre>
+32
+33</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/user.pp', line 6</span>
@@ -136,6 +137,7 @@ class confdroid_nagios::main::user (
 
 ) inherits confdroid_nagios::params {
   require confdroid_nagios::main::install
+
   if $ng_nagios_server == $fqdn {
     group { $ng_user:
       ensure    =&gt; present,