diff options
| author | Micah Anderson <micah@riseup.net> | 2012-04-12 15:35:03 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2012-04-12 15:35:03 -0400 |
| commit | dffec4d8134be8a2eb2bb3a8063b2d60d67308f1 (patch) | |
| tree | 4b78702a3c720b3f73a005c738dc90aac1e136d1 /manifests/puppetmaster | |
| parent | 4ebf3b82818427303d4d9d83daca8addcbc6f53c (diff) | |
| parent | 506767d73515f79e05057df928bf7baa94b0dfcc (diff) | |
Merge remote-tracking branch 'lelutin/freebsd' into shared
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 25709ea..f2d8613 100644 --- a/manifests/puppetmaster/base.pp +++ b/manifests/puppetmaster/base.pp @@ -5,14 +5,14 @@ class puppet::puppetmaster::base inherits puppet::base { "puppet:///modules/puppet/master/puppet.conf" ], } - 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 |