diff options
| author | mh <mh@immerda.ch> | 2009-11-14 13:51:39 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2009-11-14 13:51:39 +0100 |
| commit | 30ccaaadbdaa3a09c4ff2b58cc3105e068c0fe1c (patch) | |
| tree | 95b650e1015e6a54f67779ca64d725ccf0cadf80 /manifests/puppetmaster | |
| parent | e80e95edb9007440faa9251a6e6621116783ed91 (diff) | |
update file sources to new 0.25.x style
Diffstat (limited to 'manifests/puppetmaster')
| -rw-r--r-- | manifests/puppetmaster/base.pp | 6 | ||||
| -rw-r--r-- | manifests/puppetmaster/centos.pp | 6 | ||||
| -rw-r--r-- | manifests/puppetmaster/checklastrun.pp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/manifests/puppetmaster/base.pp b/manifests/puppetmaster/base.pp index c4ebe1f..0b208b0 100644 --- a/manifests/puppetmaster/base.pp +++ b/manifests/puppetmaster/base.pp @@ -1,7 +1,7 @@ class puppet::puppetmaster::base inherits puppet::base { File[puppet_config]{ - source => [ "puppet://$server/files/puppet/master/puppet.conf", + source => [ "puppet://$server/modules/site-puppet/master/puppet.conf", "puppet://$server/modules/puppet/master/puppet.conf" ], notify => [Service[puppet],Service[puppetmaster] ], } @@ -12,8 +12,8 @@ class puppet::puppetmaster::base inherits puppet::base { } file { "$real_puppet_fileserverconfig": - source => [ "puppet://$server/files/puppet/master/${fqdn}/fileserver.conf", - "puppet://$server/files/puppet/master/fileserver.conf", + source => [ "puppet://$server/modules/site-puppet/master/${fqdn}/fileserver.conf", + "puppet://$server/modules/site-puppet/master/fileserver.conf", "puppet://$server/modules/puppet/master/fileserver.conf" ], notify => [Service[puppet],Service[puppetmaster] ], owner => root, group => puppet, mode => 640; diff --git a/manifests/puppetmaster/centos.pp b/manifests/puppetmaster/centos.pp index f29fbaa..93a3a02 100644 --- a/manifests/puppetmaster/centos.pp +++ b/manifests/puppetmaster/centos.pp @@ -2,9 +2,9 @@ class puppet::puppetmaster::centos inherits puppet::puppetmaster::package { file{'/etc/sysconfig/puppetmaster': - source => [ "puppet://$server/files/puppet/sysconfig/${fqdn}/puppetmaster", - "puppet://$server/files/puppet/sysconfig/${domain}/puppetmaster", - "puppet://$server/files/puppet/sysconfig/puppetmaster", + source => [ "puppet://$server/modules/site-puppet/sysconfig/${fqdn}/puppetmaster", + "puppet://$server/modules/site-puppet/sysconfig/${domain}/puppetmaster", + "puppet://$server/modules/site-puppet/sysconfig/puppetmaster", "puppet://$server/modules/puppet/sysconfig/puppetmaster" ], notify => Service[puppetmaster], owner => root, group => 0, mode => 0644; diff --git a/manifests/puppetmaster/checklastrun.pp b/manifests/puppetmaster/checklastrun.pp index 90c51ae..12f1042 100644 --- a/manifests/puppetmaster/checklastrun.pp +++ b/manifests/puppetmaster/checklastrun.pp @@ -1,6 +1,6 @@ class puppet::puppetmaster::checklastrun { file{'/opt/bin/puppetlast': - source => [ "puppet://$server/files/puppet/master/puppetlast", + source => [ "puppet://$server/modules/site-puppet/master/puppetlast", "puppet://$server/modules/puppet/master/puppetlast"], owner => root, group => 0, mode => 0700; } |