diff options
| author | mh <mh@immerda.ch> | 2008-04-04 15:30:26 +0000 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2008-04-04 15:30:26 +0000 |
| commit | 8c692461a73bf3a5c01388ee489366423d757594 (patch) | |
| tree | bfa63694ee5c3442fcab5792a56745348eaf2545 /manifests/init.pp | |
| parent | 902cbedfba1b4f6edcb3a51f1a9a01cd0484273b (diff) | |
moved /dist/-stuff to /files/, heavily refactored a lot, made it more look all the same way. some sources added here and there. hope it still works everything, the location on the disk of /files/ is still call dists. no need to hurry to change that
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index d23d9c8..b118e99 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -11,8 +11,8 @@ class puppet { } $real_puppet_conf_source = $puppet_conf_source ? { - '' => [ "puppet://$server/dist/puppet/client/puppet.conf.$operatingsystem", - "puppet://$server/dist/puppet/client/puppet.conf", + '' => [ "puppet://$server/files/puppet/client/puppet.conf.$operatingsystem", + "puppet://$server/files/puppet/client/puppet.conf", "puppet://$server/puppet/client/puppet.conf.$operatingsystem", "puppet://$server/puppet/client/puppet.conf" ], default => "puppet://$server/$source", @@ -57,7 +57,7 @@ class puppet::linux { owner => root, group => 0, mode => 0644, - source => [ "puppet://$server/dist/puppet/cron.d/puppetd", + source => [ "puppet://$server/files/puppet/cron.d/puppetd", "puppet://$server/puppet/cron.d/puppetd.$operatingsystem", "puppet://$server/puppet/cron.d/puppetd" ], @@ -78,7 +78,7 @@ class puppetmaster inherits puppet { } $real_puppetmaster_conf_source = $puppet_conf_source ? { - '' => [ "puppet://$server/dist/puppet/master/puppet.conf", + '' => [ "puppet://$server/files/puppet/master/puppet.conf", "puppet://$server/puppet/master/puppet.conf" ], default => "puppet://$server/$puppet_conf_source", } @@ -89,7 +89,7 @@ class puppetmaster inherits puppet { } $real_puppet_fileserver_source = $puppet_fileserver_source ? { - '' => [ "puppet://$server/dist/puppet/master/fileserver.conf", + '' => [ "puppet://$server/files/puppet/master/fileserver.conf", "puppet://$server/puppet/master/fileserver.conf" ], default => "puppet://$server/$puppet_fileserver_source" } @@ -111,7 +111,7 @@ class puppetmaster::cluster inherits puppetmaster { } file{"/etc/init.d/puppetmaster": - source => [ "puppet://$server/dist/puppet/cluster/init.d/puppetmaster-${fqdn}", + source => [ "puppet://$server/files/puppet/cluster/init.d/puppetmaster-${fqdn}", "puppet://$server/puppet/cluster/init.d/puppetmaster.${operatingsystem}", "puppet://$server/puppet/cluster/init.d/puppetmaster" ], owner => root, |