aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2008-12-07 12:12:33 -0500
committerMicah Anderson <micah@riseup.net>2008-12-07 12:12:33 -0500
commit667d7e30df76c724d9919977360704d6a55d4c20 (patch)
tree1919f3902d0dc46fad1ca42e366cbb80f02df877
parentfa072188dc8f1b475d4000fe61ea4fcf5e82cf98 (diff)
parentec2501d07c7d3b048ee8b6829ef028fbc13a354f (diff)
downloadpuppet-sshd-667d7e30df76c724d9919977360704d6a55d4c20.tar.gz
puppet-sshd-667d7e30df76c724d9919977360704d6a55d4c20.tar.bz2
Merge commit 'ng/master'
Conflicts: manifests/init.pp Conflict due to indentation formatting differences
-rw-r--r--manifests/init.pp7
1 files changed, 7 insertions, 0 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 20dd1fb..0f0cb19 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -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 {