Merge branch 'develop' into feature/parameterize_service_notification

This commit is contained in:
Nick Chappell 2014-12-01 19:50:04 -08:00
commit 6ce20b8d1a
2 changed files with 2 additions and 2 deletions

View file

@ -3,7 +3,7 @@ define icinga2::server::features::disable () {
exec { "icinga2 disable feature ${name}":
user => 'root',
path => '/usr/bin:/usr/sbin:/bin/:/sbin',
command => "/usr/sbin/icinga2 disable feature ${name}",
command => "/usr/sbin/icinga2 feature disable ${name}",
unless => "[ ! -f /etc/icinga2/features-enabled/${name}.conf ]",
require => Class['icinga2::server::install::packages'],
}

View file

@ -3,7 +3,7 @@ define icinga2::server::features::enable () {
exec { "icinga2 enable feature ${name}":
user => 'root',
path => '/usr/bin:/usr/sbin:/bin/:/sbin',
command => "/usr/sbin/icinga2 enable feature ${name}",
command => "/usr/sbin/icinga2 feature enable ${name}",
unless => "[ ! -f /etc/icinga2/features-available/${name}.conf ] || [ -f /etc/icinga2/features-enabled/${name}.conf ]",
require => Class['icinga2::server::install::packages'],
}