summaryrefslogtreecommitdiff
path: root/puppet/modules/site_nagios/manifests
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-09-03 23:08:08 +0200
committervarac <varacanero@zeromail.org>2014-09-03 23:08:08 +0200
commit0df84cf7987c3047ecc0353e8d29c2c38437a5a2 (patch)
treec0db8548571cba8ef8bb5c2a258136c97780acf7 /puppet/modules/site_nagios/manifests
parenta54b82ff7cdae2e44bc3c159473ca03e283f0746 (diff)
parentb806d84a2fc292e3fb8a3f5fd1fb029c2cdb629e (diff)
Merge branch 'master' into develop
Conflicts: platform.rb puppet/modules/site_config/manifests/hosts.pp
Diffstat (limited to 'puppet/modules/site_nagios/manifests')
-rw-r--r--puppet/modules/site_nagios/manifests/add_service.pp8
1 files changed, 8 insertions, 0 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',