Merge branch 'jenkins-build-242' into 'master'

Auto-merge for build 242

See merge request puppet/confdroid_nagios!7

doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html

@@ -354,17 +354,7 @@ and populates /etc/nagios/conf.d/nagios_commands.cfg.
 259
 260
 261
-262
+262</pre>
-263
-264
-265
-266
-267
-268
-269
-270
-271
-272</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/nagios/objects/commands.pp', line 8</span>
@@ -622,16 +612,6 @@ class confdroid_nagios::nagios::objects::commands (
       mode         =&gt; &#39;0640&#39;,
       target       =&gt; $ng_target_command,
     }
-
-    @@nagios_command { &#39;check_puppet_server&#39;:
-      ensure       =&gt; present,
-      command_name =&gt; &#39;check_puppet_server&#39;,
-      command_line =&gt; &#39;$USER1$/check_procs -c $ARG1$ -C $ARG2$&#39;,
-      owner        =&gt; $ng_user,
-      group        =&gt; $ng_user,
-      mode         =&gt; &#39;0640&#39;,
-      target       =&gt; $ng_target_command,
-    }
   }
 }</pre>
       </td>

manifests/nagios/objects/commands.pp

@@ -258,15 +258,5 @@ class confdroid_nagios::nagios::objects::commands (
       mode         => '0640',
       target       => $ng_target_command,
     }
-
-    @@nagios_command { 'check_puppet_server':
-      ensure       => present,
-      command_name => 'check_puppet_server',
-      command_line => '$USER1$/check_procs -c $ARG1$ -C $ARG2$',
-      owner        => $ng_user,
-      group        => $ng_user,
-      mode         => '0640',
-      target       => $ng_target_command,
-    }
   }
 }