summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-08-21 12:16:43 +0200
committervarac <varacanero@zeromail.org>2014-08-21 12:41:02 +0200
commitdb6e7a72941aaf593f8cb47fa0061f39ebb29b30 (patch)
treeceb3e7f2b86cd17e6af646f888c45f3358b6c8a3 /puppet/modules
parent66e36fc3e1c4b3482876f445372e4bc9a62c8f1f (diff)
Fix "Nagios ssh check is automatically added by the ssh module and cantains a wrong hostname on single node setup (Bug #5998)"
before, the ssh module added this check, resulting in a wrong hostname and the port was always '22'. manage_nagios parameter is boolean, so we use false instead of 'no' manually add check_ssh to nagios (#5998)
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/site_nagios/manifests/add_service.pp8
-rw-r--r--puppet/modules/site_sshd/manifests/init.pp2
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',