diff options
| author | mh <mh@immerda.ch> | 2010-08-07 02:08:17 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2010-08-07 02:08:17 +0200 |
| commit | 1d7bd1ff3bd49d7d1348005bed8bba56431329f5 (patch) | |
| tree | 3fa80bc59c0e85dd71da22ec7b96c2fdf9dd54cf /manifests/puppetmaster/base.pp | |
| parent | adce830e8baf197cae3c4493f2b77e237643ecfa (diff) | |
remove unnecessary fileserver variable (#2460)
Diffstat (limited to 'manifests/puppetmaster/base.pp')
| -rw-r--r-- | manifests/puppetmaster/base.pp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/manifests/puppetmaster/base.pp b/manifests/puppetmaster/base.pp index a2bc9d4..85e9f7c 100644 --- a/manifests/puppetmaster/base.pp +++ b/manifests/puppetmaster/base.pp @@ -1,16 +1,16 @@ class puppet::puppetmaster::base inherits puppet::base { File[puppet_config]{ - source => [ "puppet://$server/modules/site-puppet/master/puppet.conf", - "puppet://$server/modules/puppet/master/puppet.conf" ], + source => [ "puppet:///modules/site-puppet/master/puppet.conf", + "puppet:///modules/puppet/master/puppet.conf" ], notify => Service[puppetmaster], } if !$puppet_fileserverconfig { $puppet_fileserverconfig = '/etc/puppet/fileserver.conf' } file { "$puppet_fileserverconfig": - source => [ "puppet://$server/modules/site-puppet/master/${fqdn}/fileserver.conf", - "puppet://$server/modules/site-puppet/master/fileserver.conf", - "puppet://$server/modules/puppet/master/fileserver.conf" ], + source => [ "puppet:///modules/site-puppet/master/${fqdn}/fileserver.conf", + "puppet:///modules/site-puppet/master/fileserver.conf", + "puppet:///modules/puppet/master/fileserver.conf" ], owner => root, group => puppet, mode => 640; } |