diff options
| author | Micah Anderson <micah@riseup.net> | 2012-06-27 22:41:03 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2012-06-27 22:41:03 -0400 |
| commit | f54e980211a88b6e470cb34e78e418e7a7b3de2a (patch) | |
| tree | 8f06b32276b73ad8973feeab7ca7f33b464e65c1 /manifests/puppetmaster | |
| parent | 06942f75f03b5c8a78c8b3a9f466bf72b1b34f5c (diff) | |
| parent | dffec4d8134be8a2eb2bb3a8063b2d60d67308f1 (diff) | |
Merge remote-tracking branch 'shared/master'
Diffstat (limited to 'manifests/puppetmaster')
| -rw-r--r-- | manifests/puppetmaster/base.pp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/manifests/puppetmaster/base.pp b/manifests/puppetmaster/base.pp index f179d47..a7dc7a5 100644 --- a/manifests/puppetmaster/base.pp +++ b/manifests/puppetmaster/base.pp @@ -8,14 +8,14 @@ class puppet::puppetmaster::base inherits puppet::base { ], } - if !$puppet_fileserverconfig { $puppet_fileserverconfig = '/etc/puppet/fileserver.conf' } + if !$puppet_fileserverconfig { $puppet_fileserverconfig = "${puppet::default_config_dir}/fileserver.conf" } file { "$puppet_fileserverconfig": 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; - } + } if $puppetmaster_storeconfigs { include puppet::puppetmaster::storeconfigs |