diff options
Diffstat (limited to 'manifests/master.pp')
| -rw-r--r-- | manifests/master.pp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/manifests/master.pp b/manifests/master.pp index 4158524..23b78d2 100644 --- a/manifests/master.pp +++ b/manifests/master.pp @@ -4,13 +4,14 @@ class nodo::master { } # Puppetmaster should be included before nodo::vserver + include puppetmasterd + if $main_master == true { - include puppetmasterd include munin::host include nagios::headless include nagios::defaults - # TODO: nagios apache workaround + # Nagios apache workaround file { "/etc/apache2/conf.d/nagios3.conf": ensure => absent, } @@ -23,7 +24,6 @@ class nodo::master { alias => ["puppet.$domain"], } } else { - include puppetmasterd::disabled host { "puppet": ensure => absent, } |