Merge commit 'ng/master'

Conflicts:

	manifests/init.pp

Conflict due to indentation formatting differences
This commit is contained in:
Micah Anderson 2008-12-07 12:12:33 -05:00
commit 667d7e30df

View file

@ -228,6 +228,13 @@ class sshd::base {
hasstatus => true,
require => File[sshd_config],
}
if $use_nagios {
case $nagios_check_ssh {
'false': { info("We don't do nagioschecks for ssh on ${fqdn}" ) }
default: { nagios::service{ "ssh_${fqdn}_port_${sshd_port}": check_command => "ssh_port!$sshd_port" } }
}
}
}
class sshd::linux inherits sshd::base {