second stab at plugins-in-modules style

[dsa-puppet.git] / modules / debian-org / manifests / init.pp

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 34415ecf6e4a3195f2fe1dc7a6f2258463eea943..76cb4758812c0710b909b673fcfdc2a5587ac4b5 100644 (file)
--- 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"],
@@ -97,17 +97,6 @@ class debian-org {
             notify => Exec["rc.local start"],
             ;
     }
-    case $hostname {
-        handel: {
-            file {
-                "/etc/puppet/lib":
-                    ensure  => directory,
-                    source => "puppet:///files/etc/puppet/lib",
-                    recurse => true,
-                    notify  => Exec["puppetmaster restart"];
-             }
-         }
-    }
    
     # set mmap_min_addr to 4096 to mitigate
     # Linux NULL-pointer dereference exploits