summaryrefslogtreecommitdiff
path: root/manifests/init.pp
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2008-04-10 22:19:59 +0000
committermh <mh@immerda.ch>2008-04-10 22:19:59 +0000
commitbf506a2fc6781b37d2137eb136594ca90b693d67 (patch)
tree007cc9462843a9bce5a8af9a0c501135c6a76f60 /manifests/init.pp
parentfba5e67189374191176483bac7204ea6676d3a58 (diff)
fixed path issues
Diffstat (limited to 'manifests/init.pp')
-rw-r--r--manifests/init.pp14
1 files changed, 12 insertions, 2 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 309033b..079b198 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -17,9 +17,14 @@ class puppet {
"puppet://$server/puppet/client/puppet.conf" ],
default => "puppet://$server/$source",
}
+
+ $real_puppet_config = $puppet_config ? {
+ '' => "/etc/puppet/puppet.conf",
+ default => $puppet_config,
+ }
file { 'puppet_config':
- path => "$config",
+ path => "$real_puppet_config",
owner => root,
group => 0,
mode => 600,
@@ -105,7 +110,12 @@ class puppetmaster::linux inherits puppet::linux {
default => "puppet://$server/$puppet_fileserver_source"
}
- file { "$fileserverconfig":
+ $real_puppet_fileserverconfig = $puppet_fileserverconfig ? {
+ '' => "/etc/puppet/fileserver.conf",
+ default => $puppet_fileserverconfig,
+ }
+
+ file { "$real_puppet_fileserverconfig":
owner => root,
group => 0,
mode => 600,