summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp6
1 files changed, 0 insertions, 6 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 03d0ba5..9b6550f 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -83,12 +83,6 @@ class puppetmaster inherits puppet {
"puppet://$server/puppet/master/puppet.conf" ],
default => "puppet://$server/$puppet_conf_source",
}
- $real_puppet_fileserver_source = $puppet_fileserver_source ? {
- '' => [ "puppet://$server/dist/puppet/master/fileserver.conf",
- "puppet://$server/puppet/master/fileserver.conf" ],
- default => "puppet://$server/$puppet_fileserver_source"
- }
-
File[puppet_config]{
source => $real_puppetmaster_conf_source,