From 3315af53c1e164b8a76ef166183933c754106ba8 Mon Sep 17 00:00:00 2001
From: Stephen Gran <steve@lobefin.net>
Date: Wed, 26 Jan 2011 07:40:23 +0000
Subject: [PATCH] move more files

Signed-off-by: Stephen Gran <steve@lobefin.net>
---
 .../preferences => modules/debian-org/files/apt.preferences | 0
 {files/etc/puppet => modules/debian-org/files}/puppet.conf  | 0
 {files/etc => modules/debian-org/files}/timezone            | 0
 modules/debian-org/manifests/init.pp                        | 6 +++---
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename files/etc/apt/preferences => modules/debian-org/files/apt.preferences (100%)
 rename {files/etc/puppet => modules/debian-org/files}/puppet.conf (100%)
 rename {files/etc => modules/debian-org/files}/timezone (100%)

diff --git a/files/etc/apt/preferences b/modules/debian-org/files/apt.preferences
similarity index 100%
rename from files/etc/apt/preferences
rename to modules/debian-org/files/apt.preferences
diff --git a/files/etc/puppet/puppet.conf b/modules/debian-org/files/puppet.conf
similarity index 100%
rename from files/etc/puppet/puppet.conf
rename to modules/debian-org/files/puppet.conf
diff --git a/files/etc/timezone b/modules/debian-org/files/timezone
similarity index 100%
rename from files/etc/timezone
rename to modules/debian-org/files/timezone
diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 34415ecf6..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"];
@@ -68,11 +68,11 @@ class debian-org {
         "/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"],
-- 
2.20.1