X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=262479a660826e0c4bf616b953269d0b8da29b1a;hb=d665197bdd18c8ef6a59c466f162de630eb9218d;hp=6a16b404fea40ce8a426af29197923e89bd38114;hpb=888c2f00b35eed7db2f38d377be8d69c7320034c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 6a16b404f..262479a66 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -50,7 +50,7 @@ class debian-org {
     }
     file {
         "/etc/apt/preferences":
-            source => "puppet:///files/etc/apt/preferences";
+            source => "puppet:///modules/debian-org/apt.preferences";
         "/etc/apt/sources.list.d/backports.org.list":
             content => template("debian-org/etc/apt/sources.list.d/backports.org.list.erb"),
             notify  => Exec["apt-get update"];
@@ -64,32 +64,32 @@ class debian-org {
             content => template("debian-org/etc/apt/sources.list.d/volatile.list.erb"),
             notify  => Exec["apt-get update"];
         "/etc/apt/apt.conf.d/local-recommends":
-            source => "puppet:///files/etc/apt/apt.conf.d/local-recommends";
+            source => "puppet:///modules/debian-org/apt.conf.d/local-recommends";
         "/etc/apt/apt.conf.d/local-pdiffs":
-            source => "puppet:///files/etc/apt/apt.conf.d/local-pdiffs";
+            source => "puppet:///modules/debian-org/apt.conf.d/local-pdiffs";
         "/etc/timezone":
-            source => "puppet:///files/etc/timezone",
+            source => "puppet:///modules/debian-org/timezone",
             notify => Exec["dpkg-reconfigure tzdata -pcritical -fnoninteractive"];
         "/etc/puppet/puppet.conf":
             # require => Package["puppet"],
-            source => "puppet:///files/etc/puppet/puppet.conf"
+            source => "puppet:///modules/debian-org/puppet.conf"
             ;
         "/etc/default/puppet":
             # require => Package["puppet"],
-            source => "puppet:///files/etc/default/puppet"
+            source => "puppet:///modules/debian-org/puppet.default"
             ;
 
         "/etc/cron.d/dsa-puppet-stuff":
-            source => "puppet:///files/etc/cron.d/dsa-puppet-stuff",
+            source => "puppet:///modules/debian-org/dsa-puppet-stuff.cron",
             require => Package["cron"]
             ;
         "/etc/ldap/ldap.conf":
             require => Package["userdir-ldap"],
-            source => "puppet:///files/etc/ldap/ldap.conf",
+            source => "puppet:///modules/debian-org/ldap.conf",
             ;
         "/etc/pam.d/common-session":
             require => Package["libpam-pwdfile"],
-            source => "puppet:///files/etc/pam.d/common-session",
+            source => "puppet:///modules/debian-org/pam.common-session",
             ;
         "/etc/rc.local":
             mode   => 0755,