diff options
| author | Gabriel Filion <lelutin@gmail.com> | 2011-07-16 16:39:16 -0400 |
|---|---|---|
| committer | Gabriel Filion <lelutin@gmail.com> | 2011-07-16 20:59:01 -0400 |
| commit | b333a0ed2561256ff5a2af0cb0e46ea663ac647c (patch) | |
| tree | b61fa3e3ce5620c2dda1de7da60bebe974136953 | |
| parent | 618384cf08340b34a4eaf1022d200c1acb8161f4 (diff) | |
Support FreeBSD for the puppet master
The puppet master has one additional config file that needs to be placed
in a different folder under FreeBSD.
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
| -rw-r--r-- | manifests/puppetmaster/base.pp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/manifests/puppetmaster/base.pp b/manifests/puppetmaster/base.pp index 6ac1e0c..820e499 100644 --- a/manifests/puppetmaster/base.pp +++ b/manifests/puppetmaster/base.pp @@ -5,7 +5,14 @@ class puppet::puppetmaster::base inherits puppet::base { "puppet:///modules/puppet/master/puppet.conf" ], } - if !$puppet_fileserverconfig { $puppet_fileserverconfig = '/etc/puppet/fileserver.conf' } + # This is not in puppet::puppetmaster since we'd like for + # puppet::puppetmaster::cluster to work in FreeBSD too. + $puppet_default_config_dir = $operatingsystem ? { + freebsd => "/usr/local/etc/puppet", + default => "/etc/puppet", + } + + if !$puppet_fileserverconfig { $puppet_fileserverconfig = "${puppet_default_config_dir}/fileserver.conf" } file { "$puppet_fileserverconfig": source => [ "puppet:///modules/site-puppet/master/${fqdn}/fileserver.conf", |