diff options
| author | mh <mh@immerda.ch> | 2012-02-02 10:12:16 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2012-02-02 10:12:16 +0100 |
| commit | 9d1e4d707694489b91a4c5b5be7af44cf9b9493d (patch) | |
| tree | dc75d078b532748c9632575b62480f7deb9dab0b /manifests/defaults | |
| parent | 10390a88051ea4e3ad0ded1cbf0cb93df553fe78 (diff) | |
| parent | 108a2f0483b39901a0cbb321a9de63a2cf3c49ac (diff) | |
Merge remote-tracking branch 'github/master'
Diffstat (limited to 'manifests/defaults')
| -rw-r--r-- | manifests/defaults/commands.pp | 4 | ||||
| -rw-r--r-- | manifests/defaults/templates.pp | 4 | ||||
| -rw-r--r-- | manifests/defaults/vars.pp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/manifests/defaults/commands.pp b/manifests/defaults/commands.pp index 17d1408..3b0da37 100644 --- a/manifests/defaults/commands.pp +++ b/manifests/defaults/commands.pp @@ -4,7 +4,7 @@ class nagios::defaults::commands { include nagios::command::imap_pop3 # common service commands - case $operatingsystem { + case $::operatingsystem { debian,ubuntu: { nagios_command { check_dummy: @@ -122,7 +122,7 @@ class nagios::defaults::commands { # notification commands - $mail_cmd_location = $operatingsystem ? { + $mail_cmd_location = $::operatingsystem ? { centos => '/bin/mail', default => '/usr/bin/mail' } diff --git a/manifests/defaults/templates.pp b/manifests/defaults/templates.pp index c97eee4..aec97c0 100644 --- a/manifests/defaults/templates.pp +++ b/manifests/defaults/templates.pp @@ -4,9 +4,9 @@ class nagios::defaults::templates { file { 'nagios_templates': path => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_templates.cfg", source => [ "puppet:///modules/site-nagios/configs/${fqdn}/nagios_templates.cfg", - "puppet:///modules/site-nagios/configs/${operatingsystem}/nagios_templates.cfg", + "puppet:///modules/site-nagios/configs/${::operatingsystem}/nagios_templates.cfg", "puppet:///modules/site-nagios/configs/nagios_templates.cfg", - "puppet:///modules/nagios/configs/${operatingsystem}/nagios_templates.cfg", + "puppet:///modules/nagios/configs/${::operatingsystem}/nagios_templates.cfg", "puppet:///modules/nagios/configs/nagios_templates.cfg" ], notify => Service['nagios'], mode => 0644, owner => root, group => root; diff --git a/manifests/defaults/vars.pp b/manifests/defaults/vars.pp index 6302f13..b0aef57 100644 --- a/manifests/defaults/vars.pp +++ b/manifests/defaults/vars.pp @@ -1,6 +1,6 @@ class nagios::defaults::vars { case $nagios_cfgdir { - '': { $int_nagios_cfgdir = $operatingsystem ? { + '': { $int_nagios_cfgdir = $::operatingsystem ? { centos => '/etc/nagios/', default => '/etc/nagios3' } |