summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'manifests')
-rw-r--r--manifests/cron/base.pp8
-rw-r--r--manifests/puppetmaster/base.pp10
2 files changed, 0 insertions, 18 deletions
diff --git a/manifests/cron/base.pp b/manifests/cron/base.pp
index 5fc55d2..6688c5e 100644
--- a/manifests/cron/base.pp
+++ b/manifests/cron/base.pp
@@ -5,14 +5,6 @@ class puppet::cron::base inherits puppet::base {
enable => false,
}
- if defined (puppet::puppetmaster) {}
- else {
- File['puppet_config']{
- notify => undef
- }
- }
-
-
case $operatingsystem {
debian,openbsd,ubuntu: {
#it's already disabled
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",