Merge commit 'ng/master'

Conflicts:

	manifests/init.pp

Conflict due to indentation formatting differences

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 {