summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp10
-rw-r--r--manifests/puppetmaster/base.pp11
2 files changed, 8 insertions, 13 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index fb10773..c05631a 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -19,15 +19,17 @@
#
class puppet {
- $puppet_default_config = $kernel ? {
- freebsd => '/usr/local/etc/puppet/puppet.conf',
- default => '/etc/puppet/puppet.conf',
+ $default_config_dir = $operatingsystem ? {
+ freebsd => "/usr/local/etc/puppet",
+ default => "/etc/puppet",
}
+ $puppet_default_config = "$default_config_dir/puppet.conf"
+
if $puppet_config == '' { $puppet_config = $puppet_default_config }
case $kernel {
- linux: {
+ linux: {
case $operatingsystem {
gentoo: { include puppet::gentoo }
centos: { include puppet::centos }
diff --git a/manifests/puppetmaster/base.pp b/manifests/puppetmaster/base.pp
index 820e499..0000513 100644
--- a/manifests/puppetmaster/base.pp
+++ b/manifests/puppetmaster/base.pp
@@ -5,21 +5,14 @@ class puppet::puppetmaster::base inherits puppet::base {
"puppet:///modules/puppet/master/puppet.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" }
+ 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