diff options
| -rw-r--r-- | manifests/init.pp | 7 | ||||
| -rw-r--r-- | templates/sshd_config/Debian_etch.erb | 2 | ||||
| -rw-r--r-- | templates/sshd_config/Debian_lenny.erb | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 9d34f50..0480fee 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -233,6 +233,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 { diff --git a/templates/sshd_config/Debian_etch.erb b/templates/sshd_config/Debian_etch.erb index f30242d..f030a62 100644 --- a/templates/sshd_config/Debian_etch.erb +++ b/templates/sshd_config/Debian_etch.erb @@ -131,7 +131,7 @@ KeepAlive yes #ReverseMappingCheck yes <%- if sshd_sftp_subsystem.to_s.empty? then %> -#Subsystem sftp /usr/lib/sftp-server +Subsystem sftp /usr/lib/openssh/sftp-server <%- else %> Subsystem sftp <%= sshd_sftp_subsystem %> <%- end %> diff --git a/templates/sshd_config/Debian_lenny.erb b/templates/sshd_config/Debian_lenny.erb index 146e664..1762da3 100644 --- a/templates/sshd_config/Debian_lenny.erb +++ b/templates/sshd_config/Debian_lenny.erb @@ -131,7 +131,7 @@ KeepAlive yes #ReverseMappingCheck yes <%- if sshd_sftp_subsystem.to_s.empty? then %> -#Subsystem sftp /usr/lib/sftp-server +Subsystem sftp /usr/lib/openssh/sftp-server <%- else %> Subsystem sftp <%= sshd_sftp_subsystem %> <%- end %> |