diff options
| author | Micah Anderson <micah@leap.se> | 2014-08-21 10:26:23 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2014-08-21 10:26:23 -0400 |
| commit | 4ebd86a151919b8889b166e94d75f0fc35b7010e (patch) | |
| tree | b2f6d806e6fd670c5ddcd99c18ec1691d0e019b1 | |
| parent | 187b0dfc90d568449af73b37f57acdb39b2ac2bb (diff) | |
| parent | db6e7a72941aaf593f8cb47fa0061f39ebb29b30 (diff) | |
Merge remote-tracking branch 'varac/5998_fix_nagios_nodename' into 0.5.3
| -rw-r--r-- | puppet/modules/site_nagios/manifests/add_service.pp | 8 | ||||
| -rw-r--r-- | puppet/modules/site_sshd/manifests/init.pp | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/puppet/modules/site_nagios/manifests/add_service.pp b/puppet/modules/site_nagios/manifests/add_service.pp index 8d2a310b..1b67d14e 100644 --- a/puppet/modules/site_nagios/manifests/add_service.pp +++ b/puppet/modules/site_nagios/manifests/add_service.pp @@ -1,9 +1,17 @@ define site_nagios::add_service ( $hostname, $ip_address, $openvpn_gw = '', $service) { + $ssh = hiera_hash('ssh') + $ssh_port = $ssh['port'] + case $service { 'webapp': { nagios_service { + "${name}_ssh": + use => 'generic-service', + check_command => "check_ssh_port!$ssh_port", + service_description => 'SSH', + host_name => $hostname; "${name}_cert": use => 'generic-service', check_command => 'check_https_cert', diff --git a/puppet/modules/site_sshd/manifests/init.pp b/puppet/modules/site_sshd/manifests/init.pp index 400c21ea..9a05b6ed 100644 --- a/puppet/modules/site_sshd/manifests/init.pp +++ b/puppet/modules/site_sshd/manifests/init.pp @@ -52,7 +52,7 @@ class site_sshd { ## SSHD SERVER CONFIGURATION ## class { '::sshd': - manage_nagios => 'no', + manage_nagios => false, ports => $ssh['port'], use_pam => 'yes', hardened_ssl => 'yes', |