diff options
| -rw-r--r-- | manifests/master.pp | 15 |
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") } |