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
+23</pre>
-24
-25
-26
-27</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/monitoring/target.pp', line 6</span>
@@ -130,22 +126,18 @@
 class confdroid_apache::monitoring::target (
 
 ) inherits confdroid_apache::params {
-  case $ae_incl_target {
+  if $ae_incl_target == true {
-    false: { notify { &#39;Nagios Service target for check_httpd has been disabled via parameters / ENC override&#39;: }
+    @@nagios_service { &quot;check_http_${fqdn}&quot;:
-    }
+      check_command       =&gt; &#39;check_http&#39;,
-    default: {
+      use                 =&gt; &#39;generic-service&#39;,
-      @@nagios_service { &quot;check_http_${fqdn}&quot;:
+      host_name           =&gt; $fqdn,
-        check_command       =&gt; &#39;check_http&#39;,
+      notification_period =&gt; &#39;24x7&#39;,
-        use                 =&gt; &#39;generic-service&#39;,
+      service_description =&gt; &quot;${fqdn}_check_http&quot;,
-        host_name           =&gt; $fqdn,
+      target              =&gt; $ae_target_service,
-        notification_period =&gt; &#39;24x7&#39;,
+      owner               =&gt; &#39;nagios&#39;,
-        service_description =&gt; &quot;${fqdn}_check_http&quot;,
+      group               =&gt; &#39;nagios&#39;,
-        target              =&gt; $ae_target_service,
+      mode                =&gt; &#39;0640&#39;,
-        owner               =&gt; &#39;nagios&#39;,
+      contacts            =&gt; &#39;ops&#39;,
-        group               =&gt; &#39;nagios&#39;,
-        mode                =&gt; &#39;0640&#39;,
-        contacts            =&gt; &#39;ops&#39;,
-      }
     }
   }
 }</pre>