update file sources to new 0.25.x style

6 files changed, 16 insertions, 16 deletions

diff --git a/manifests/base.pp b/manifests/base.pp
index e6ea40a..081df5e 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -5,9 +5,9 @@ class puppet::base {
 
     file { 'puppet_config':
         path => "$puppet_config",
-        source => [ "puppet://$server/files/puppet/client/${fqdn}/puppet.conf",
-                "puppet://$server/files/puppet/client/puppet.conf.$operatingsystem",
-                "puppet://$server/files/puppet/client/puppet.conf",
+        source => [ "puppet://$server/modules/site-puppet/client/${fqdn}/puppet.conf",
+                "puppet://$server/modules/site-puppet/client/puppet.conf.$operatingsystem",
+                "puppet://$server/modules/site-puppet/client/puppet.conf",
                 "puppet://$server/modules/puppet/client/puppet.conf.$operatingsystem",
                 "puppet://$server/modules/puppet/client/puppet.conf" ],
         notify => Service[puppet],
diff --git a/manifests/centos.pp b/manifests/centos.pp
index 41227f9..87b4fbc 100644
--- a/manifests/centos.pp
+++ b/manifests/centos.pp
@@ -1,8 +1,8 @@
 class puppet::centos inherits puppet::linux {
     file{'/etc/sysconfig/puppet':
-        source => [ "puppet://$server/files/puppet/sysconfig/${fqdn}/puppet",
-                    "puppet://$server/files/puppet/sysconfig/${domain}/puppet",
-                    "puppet://$server/files/puppet/sysconfig/puppet",
+        source => [ "puppet://$server/modules/site-puppet/sysconfig/${fqdn}/puppet",
+                    "puppet://$server/modules/site-puppet/sysconfig/${domain}/puppet",
+                    "puppet://$server/modules/site-puppet/sysconfig/puppet",
                     "puppet://$server/modules/puppet/sysconfig/puppet" ],
         notify => Service[puppet],
         owner => root, group => 0, mode => 0644;
diff --git a/manifests/debian.pp b/manifests/debian.pp
index d028471..62c7661 100644
--- a/manifests/debian.pp
+++ b/manifests/debian.pp
@@ -1,8 +1,8 @@
 class puppet::debian inherits puppet::linux {
     file{'/etc/default/puppet':
-        source => [ "puppet://$server/files/puppet/client/debian/${fqdn}/puppet",
-                    "puppet://$server/files/puppet/client/debian/${domain}/puppet",
-                    "puppet://$server/files/puppet/client/debian/puppet",
+        source => [ "puppet://$server/modules/site-puppet/client/debian/${fqdn}/puppet",
+                    "puppet://$server/modules/site-puppet/client/debian/${domain}/puppet",
+                    "puppet://$server/modules/site-puppet/client/debian/puppet",
                     "puppet://$server/modules/puppet/client/debian/puppet" ],
         notify => Service[puppet],
         owner => root, group => 0, mode => 0644;
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;
     }