Recommit for updates in build 194

doc/puppet_classes/confdroid_nagios_3A_3Aclient_3A_3Atarget.html

@@ -222,7 +222,7 @@
 class confdroid_nagios::client::target (
 
 ) inherits confdroid_nagios::params {
-  if ($ng_nagios_server == $fqdn) and ($ng_enable_target == true) {
+  if ($ng_nagios_server != $fqdn) and ($ng_enable_target == true) {
     @@nagios_host { $fqdn:
       ensure              => $ng_ping_ensure,
       alias               => $hostname,

doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Anagios.html

@@ -218,23 +218,7 @@
 120
 121
 122
-123
+123</pre>
-124
-125
-126
-127
-128
-129
-130
-131
-132
-133
-134
-135
-136
-137
-138
-139</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/server/nagios.pp', line 6</span>
@@ -243,22 +227,6 @@ class confdroid_nagios::server::nagios (
 
 ) inherits confdroid_nagios::params {
   if $ng_nagios_server == $fqdn {
-    @@nagios_host { &#39;localhost&#39;:
-      ensure              =&gt; $ng_ping_ensure,
-      alias               =&gt; &#39;localhost&#39;,
-      address             =&gt; &#39;127.0.0.1&#39;,
-      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;,