summaryrefslogtreecommitdiff
path: root/puppet/modules/site_nagios
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-02-27 22:43:23 +0100
committervarac <varacanero@zeromail.org>2014-02-27 22:43:23 +0100
commit0cd0076f945c0e02bfdc50ff483ceebceec131e2 (patch)
tree21c631e5bdee5e3019c7fbe4dfac1b04ef325599 /puppet/modules/site_nagios
parente8cd9ab2d4480aa7c16d15f5db664fa650d4c655 (diff)
parent66cc1345c3af4e814d98c8e4b90d90158ac9d399 (diff)
Merge branch 'one_monitornode_rules_them_all' into 0.6
Diffstat (limited to 'puppet/modules/site_nagios')
-rw-r--r--puppet/modules/site_nagios/files/configs/Debian/nagios.cfg2
-rw-r--r--puppet/modules/site_nagios/manifests/add_host_services.pp2
-rw-r--r--puppet/modules/site_nagios/manifests/server.pp4
3 files changed, 5 insertions, 3 deletions
diff --git a/puppet/modules/site_nagios/files/configs/Debian/nagios.cfg b/puppet/modules/site_nagios/files/configs/Debian/nagios.cfg
index 61d9f2da..9bd3da28 100644
--- a/puppet/modules/site_nagios/files/configs/Debian/nagios.cfg
+++ b/puppet/modules/site_nagios/files/configs/Debian/nagios.cfg
@@ -251,7 +251,7 @@ log_archive_path=/var/log/nagios3/archives
# If you want messages logged to the syslog facility, as well as the
# Nagios log file set this option to 1. If not, set it to 0.
-use_syslog=1
+use_syslog=0
diff --git a/puppet/modules/site_nagios/manifests/add_host_services.pp b/puppet/modules/site_nagios/manifests/add_host_services.pp
index 2d615ff1..279809d1 100644
--- a/puppet/modules/site_nagios/manifests/add_host_services.pp
+++ b/puppet/modules/site_nagios/manifests/add_host_services.pp
@@ -1,7 +1,9 @@
define site_nagios::add_host_services (
+ $domain_full_suffix,
$domain_internal,
$ip_address,
$services,
+ $ssh_port,
$openvpn_gateway_address='' ) {
$nagios_hostname = $domain_internal
diff --git a/puppet/modules/site_nagios/manifests/server.pp b/puppet/modules/site_nagios/manifests/server.pp
index ca38d7fc..9aae8ae8 100644
--- a/puppet/modules/site_nagios/manifests/server.pp
+++ b/puppet/modules/site_nagios/manifests/server.pp
@@ -7,7 +7,7 @@ class site_nagios::server inherits nagios::base {
$nagios_hiera = hiera('nagios')
$nagiosadmin_pw = htpasswd_sha1($nagios_hiera['nagiosadmin_pw'])
- $hosts = $nagios_hiera['hosts']
+ $nagios_hosts = $nagios_hiera['hosts']
include nagios::defaults
include nagios::base
@@ -43,7 +43,7 @@ class site_nagios::server inherits nagios::base {
group => 'nagios',
}
- create_resources ( site_nagios::add_host_services, $hosts )
+ create_resources ( site_nagios::add_host_services, $nagios_hosts )
include site_nagios::server::apache
include site_check_mk::server