diff options
| -rw-r--r-- | manifests/debian.pp | 2 | ||||
| -rw-r--r-- | manifests/linux.pp | 4 | ||||
| -rw-r--r-- | manifests/puppetmaster/base.pp | 8 | ||||
| -rw-r--r-- | manifests/puppetmaster/centos.pp | 2 | ||||
| -rw-r--r-- | manifests/puppetmaster/checklastrun.pp | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/manifests/debian.pp b/manifests/debian.pp index 307d8a9..d028471 100644 --- a/manifests/debian.pp +++ b/manifests/debian.pp @@ -3,7 +3,7 @@ class puppet::debian inherits puppet::linux { source => [ "puppet://$server/files/puppet/client/debian/${fqdn}/puppet", "puppet://$server/files/puppet/client/debian/${domain}/puppet", "puppet://$server/files/puppet/client/debian/puppet", - "puppet://$server/puppet/client/debian/puppet" ], + "puppet://$server/modules/puppet/client/debian/puppet" ], notify => Service[puppet], owner => root, group => 0, mode => 0644; } # there is really no status cmd for it diff --git a/manifests/linux.pp b/manifests/linux.pp index f6502f2..afbda8d 100644 --- a/manifests/linux.pp +++ b/manifests/linux.pp @@ -11,8 +11,8 @@ class puppet::linux inherits puppet::base { file{'/etc/cron.d/puppetd.cron': - source => [ "puppet://$server/puppet/cron.d/puppetd.${operatingsystem}", - "puppet://$server/puppet/cron.d/puppetd" ], + source => [ "puppet://$server/modules/puppet/cron.d/puppetd.${operatingsystem}", + "puppet://$server/modules/puppet/cron.d/puppetd" ], owner => root, group => 0, mode => 0644; } } diff --git a/manifests/puppetmaster/base.pp b/manifests/puppetmaster/base.pp index b8a2118..c4ebe1f 100644 --- a/manifests/puppetmaster/base.pp +++ b/manifests/puppetmaster/base.pp @@ -2,7 +2,7 @@ class puppet::puppetmaster::base inherits puppet::base { File[puppet_config]{ source => [ "puppet://$server/files/puppet/master/puppet.conf", - "puppet://$server/puppet/master/puppet.conf" ], + "puppet://$server/modules/puppet/master/puppet.conf" ], notify => [Service[puppet],Service[puppetmaster] ], } @@ -14,7 +14,7 @@ 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", - "puppet://$server/puppet/master/fileserver.conf" ], + "puppet://$server/modules/puppet/master/fileserver.conf" ], notify => [Service[puppet],Service[puppetmaster] ], owner => root, group => puppet, mode => 640; } @@ -25,8 +25,8 @@ class puppet::puppetmaster::base inherits puppet::base { # restart the master from time to time to avoid memory problems file{'/etc/cron.d/puppetmaster.cron': - source => [ "puppet://$server/puppet/cron.d/puppetmaster.${operatingsystem}", - "puppet://$server/puppet/cron.d/puppetmaster" ], + source => [ "puppet://$server/modules/puppet/cron.d/puppetmaster.${operatingsystem}", + "puppet://$server/modules/puppet/cron.d/puppetmaster" ], owner => root, group => 0, mode => 0644; } diff --git a/manifests/puppetmaster/centos.pp b/manifests/puppetmaster/centos.pp index eab652b..f29fbaa 100644 --- a/manifests/puppetmaster/centos.pp +++ b/manifests/puppetmaster/centos.pp @@ -5,7 +5,7 @@ class puppet::puppetmaster::centos inherits puppet::puppetmaster::package { source => [ "puppet://$server/files/puppet/sysconfig/${fqdn}/puppetmaster", "puppet://$server/files/puppet/sysconfig/${domain}/puppetmaster", "puppet://$server/files/puppet/sysconfig/puppetmaster", - "puppet://$server/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 7686fec..90c51ae 100644 --- a/manifests/puppetmaster/checklastrun.pp +++ b/manifests/puppetmaster/checklastrun.pp @@ -1,7 +1,7 @@ class puppet::puppetmaster::checklastrun { file{'/opt/bin/puppetlast': source => [ "puppet://$server/files/puppet/master/puppetlast", - "puppet://$server/puppet/master/puppetlast"], + "puppet://$server/modules/puppet/master/puppetlast"], owner => root, group => 0, mode => 0700; } file{'/etc/cron.d/puppetlast.cron': |