Recommit for updates in build 210

doc/puppet_classes/confdroid_nagios_3A_3Aclient_3A_3Atarget.html

@@ -231,7 +231,7 @@
 class confdroid_nagios::client::target (
 
 ) inherits confdroid_nagios::params {
-  if ($ng_nagios_server != $fqdn) and ($ng_enable_target == true) {
+  if $ng_enable_target == true {
     package { $ng_reqpackages_client:
       ensure => $ng_pkg_ensure,
     }

doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Anagios.html

@@ -267,24 +267,7 @@
 169
 170
 171
-172
-173
-174
-175
-176
-177
-178
-179
-180
-181
-182
-183
-184
-185
-186
-187
-188
-189</pre>
+172</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/server/nagios.pp', line 6</span>
@@ -310,23 +293,6 @@ class confdroid_nagios::server::nagios (
       notify              =&gt; Service[$ng_service],
     }
 
-    @@nagios_host { $fqdn:
-      ensure              =&gt; $ng_ping_ensure,
-      alias               =&gt; $hostname,
-      address             =&gt; $fqdn,
-      use                 =&gt; &#39;linux-server&#39;,
-      target              =&gt; $ng_target_localhost,
-      hostgroups          =&gt; &#39;linux-servers&#39;,
-      contacts            =&gt; $ng_contact_name,
-      max_check_attempts  =&gt; $ng_max_check_attempts,
-      notification_period =&gt; &#39;24x7&#39;,
-      owner               =&gt; $ng_user,
-      group               =&gt; $ng_user,
-      mode                =&gt; &#39;0640&#39;,
-      check_command       =&gt; &quot;check_ping!${ng_ping_warn}!${ng_ping_crit}&quot;,
-      notify              =&gt; Service[$ng_service],
-    }
-
     @@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;,