summaryrefslogtreecommitdiff
path: root/manifests/puppetmaster/base.pp
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2010-07-15 19:43:40 +0200
committervarac <varacanero@zeromail.org>2010-07-15 19:43:40 +0200
commit0692e4ae0cc053031eaa8f9b097b90646df737a8 (patch)
tree05a8b2e0757ed2a19165030f72a46a32cd17c328 /manifests/puppetmaster/base.pp
parent49269904cbedbe62a9f9bb472ba7b5a316d2effa (diff)
puppetd doesnt need to get notified at all, its built-in
Diffstat (limited to 'manifests/puppetmaster/base.pp')
-rw-r--r--manifests/puppetmaster/base.pp10
1 files changed, 0 insertions, 10 deletions
diff --git a/manifests/puppetmaster/base.pp b/manifests/puppetmaster/base.pp
index 4a1cb6f..b23e386 100644
--- a/manifests/puppetmaster/base.pp
+++ b/manifests/puppetmaster/base.pp
@@ -1,19 +1,9 @@
class puppet::puppetmaster::base inherits puppet::base {
- if defined (puppet::cron) {
File[puppet_config]{
source => [ "puppet://$server/modules/site-puppet/master/puppet.conf",
"puppet://$server/modules/puppet/master/puppet.conf" ],
notify => Service[puppetmaster],
}
- }
- else {
- File[puppet_config]{
- source => [ "puppet://$server/modules/site-puppet/master/puppet.conf",
- "puppet://$server/modules/puppet/master/puppet.conf" ],
- notify => [Service[puppet],Service[puppetmaster] ],
- }
-
- }
$real_puppet_fileserverconfig = $puppet_fileserverconfig ? {
'' => "/etc/puppet/fileserver.conf",