diff options
| author | mh <mh@immerda.ch> | 2010-12-12 16:24:47 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2010-12-12 16:24:47 +0100 |
| commit | 0c101a6577dcb5c7f07d33e200ac0d04ac6dceef (patch) | |
| tree | 76ab9d58f8ca91c5c006416b6bfdc643cae976f0 /manifests | |
| parent | c9c4f5bb895e98e31d84c751a7fcbdae9bf57008 (diff) | |
include the commands at the right place
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/defaults/commands.pp | 3 | ||||
| -rw-r--r-- | manifests/service/smtp.pp | 2 | ||||
| -rw-r--r-- | manifests/service/ssmtp.pp | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/manifests/defaults/commands.pp b/manifests/defaults/commands.pp index e0b97d1..27cb641 100644 --- a/manifests/defaults/commands.pp +++ b/manifests/defaults/commands.pp @@ -1,7 +1,8 @@ class nagios::defaults::commands { - # common service commands + include nagios::command::smtp, + # common service commands case $operatingsystem { debian,ubuntu: { nagios_command { diff --git a/manifests/service/smtp.pp b/manifests/service/smtp.pp index 0175bf7..14237a9 100644 --- a/manifests/service/smtp.pp +++ b/manifests/service/smtp.pp @@ -19,8 +19,6 @@ define nagios::service::smtp( default => $host } - include nagios::command::smtp - nagios::service{ "smtp_${name}_${port}": ensure => $ensure; diff --git a/manifests/service/ssmtp.pp b/manifests/service/ssmtp.pp index 2467fe0..b05678a 100644 --- a/manifests/service/ssmtp.pp +++ b/manifests/service/ssmtp.pp @@ -9,8 +9,6 @@ define nagios::service::ssmtp( default => $host } - include nagios::command::smtp - nagios::service{ "ssmtp_${name}_${port}": ensure => $ensure; |