diff --git a/doc/file.README.html b/doc/file.README.html index 6938b78..0708c08 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -119,7 +119,7 @@
  • manage firewall settings (optional)

  • -

    manage nagios monitoring (optional)

    +

    manage nagios monitoring for the service (optional)

  • Maintenance

    diff --git a/doc/index.html b/doc/index.html index 0fb5d4f..7013215 100644 --- a/doc/index.html +++ b/doc/index.html @@ -119,7 +119,7 @@
  • manage firewall settings (optional)

  • -

    manage nagios monitoring (optional)

    +

    manage nagios monitoring for the service (optional)

  • Maintenance

    diff --git a/doc/puppet_classes/confdroid_apache_3A_3Amonitoring_3A_3Atarget.html b/doc/puppet_classes/confdroid_apache_3A_3Amonitoring_3A_3Atarget.html index e5bc2d0..7fb4063 100644 --- a/doc/puppet_classes/confdroid_apache_3A_3Amonitoring_3A_3Atarget.html +++ b/doc/puppet_classes/confdroid_apache_3A_3Amonitoring_3A_3Atarget.html @@ -118,11 +118,7 @@ 20 21 22 -23 -24 -25 -26 -27 +23
    # File 'manifests/monitoring/target.pp', line 6
    @@ -130,22 +126,18 @@
     class confdroid_apache::monitoring::target (
     
     ) inherits confdroid_apache::params {
    -  case $ae_incl_target {
    -    false: { notify { 'Nagios Service target for check_httpd has been disabled via parameters / ENC override': }
    -    }
    -    default: {
    -      @@nagios_service { "check_http_${fqdn}":
    -        check_command       => 'check_http',
    -        use                 => 'generic-service',
    -        host_name           => $fqdn,
    -        notification_period => '24x7',
    -        service_description => "${fqdn}_check_http",
    -        target              => $ae_target_service,
    -        owner               => 'nagios',
    -        group               => 'nagios',
    -        mode                => '0640',
    -        contacts            => 'ops',
    -      }
    +  if $ae_incl_target == true {
    +    @@nagios_service { "check_http_${fqdn}":
    +      check_command       => 'check_http',
    +      use                 => 'generic-service',
    +      host_name           => $fqdn,
    +      notification_period => '24x7',
    +      service_description => "${fqdn}_check_http",
    +      target              => $ae_target_service,
    +      owner               => 'nagios',
    +      group               => 'nagios',
    +      mode                => '0640',
    +      contacts            => 'ops',
         }
       }
     }