Recommit for updates in build 35

doc/file.README.html

@@ -119,7 +119,7 @@
 </li><li>
 <p>manage firewall settings (optional)</p>
 </li><li>
-<p>manage nagios monitoring (optional)</p>
+<p>manage nagios monitoring for the service (optional)</p>
 </li></ul>
 
 <p>Maintenance</p>

doc/index.html

@@ -119,7 +119,7 @@
 </li><li>
 <p>manage firewall settings (optional)</p>
 </li><li>
-<p>manage nagios monitoring (optional)</p>
+<p>manage nagios monitoring for the service (optional)</p>
 </li></ul>
 
 <p>Maintenance</p>

doc/puppet_classes/confdroid_apache_3A_3Amonitoring_3A_3Atarget.html

@@ -118,11 +118,7 @@
 20
 21
 22
-23
-24
-25
-26
-27</pre>
+23</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/monitoring/target.pp', line 6</span>
@@ -130,10 +126,7 @@
 class confdroid_apache::monitoring::target (
 
 ) inherits confdroid_apache::params {
-  case $ae_incl_target {
-    false: { notify { &#39;Nagios Service target for check_httpd has been disabled via parameters / ENC override&#39;: }
-    }
-    default: {
+  if $ae_incl_target == true {
     @@nagios_service { &quot;check_http_${fqdn}&quot;:
       check_command       =&gt; &#39;check_http&#39;,
       use                 =&gt; &#39;generic-service&#39;,
@@ -147,7 +140,6 @@ class confdroid_apache::monitoring::target (
       contacts            =&gt; &#39;ops&#39;,
     }
   }
-  }
 }</pre>
       </td>
     </tr>