aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-09-19 11:52:33 -0300
committerSilvio Rhatto <rhatto@riseup.net>2011-09-19 11:52:33 -0300
commite230346572ba90a7bc4a1d6698924f9cf674820d (patch)
treef03ebaaebba6dd6b1a52acdd18cd087ae129eedb
parent2f7a078e4c5da2e79a7b05e2a52fbb4de6bfc0b7 (diff)
downloadpuppet-nodo-e230346572ba90a7bc4a1d6698924f9cf674820d.tar.gz
puppet-nodo-e230346572ba90a7bc4a1d6698924f9cf674820d.tar.bz2
Manage nagios on every master
-rw-r--r--manifests/master.pp15
1 files changed, 8 insertions, 7 deletions
diff --git a/manifests/master.pp b/manifests/master.pp
index 82801f4..59f2678 100644
--- a/manifests/master.pp
+++ b/manifests/master.pp
@@ -20,13 +20,6 @@ class nodo::master {
include munin::host
include munin::plugins::muninhost
- include nagios::headless
- include nagios::defaults
-
- # Nagios apache workaround
- file { "/etc/apache2/conf.d/nagios3.conf":
- ensure => absent,
- }
# The main master has a host entry pointing to itself, other
# masters still retrieve catalogs from the main master.
@@ -48,6 +41,14 @@ class nodo::master {
include database
include gitosis
include websites::admin
+ include nagios::headless
+ include nagios::defaults
+
+ # Nagios apache workaround
+ file { "/etc/apache2/conf.d/nagios3.conf":
+ ensure => absent,
+ }
+
case $puppetmaster_db_password {
'': { fail("Please set \$puppetmaster_db_password in your host config") }