X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=d56db42adac49e9ac4980dd8bb134da69362ca6d;hb=27daf2e720afc024221a6aaca4d1b70ff8bb29ad;hp=19fbd60606b6231ebf01d0d00bb6bcce0c125f43;hpb=2f0cdbb3c69400e04c769e9efaa34fa8940267a2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 19fbd6060..d56db42ad 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -49,16 +49,16 @@ class debian-org {
       "/etc/apt/preferences":
              source => "puppet:///files/etc/apt/preferences";
       "/etc/apt/sources.list.d/backports.org.list":
-             source => "puppet:///files/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"];
       "/etc/apt/sources.list.d/debian.org.list":
-             source => "puppet:///files/etc/apt/sources.list.d/debian.org.list",
+             content => template("debian-org/etc/apt/sources.list.d/debian.org.list.erb"),
              notify  => Exec["apt-get update"];
       "/etc/apt/sources.list.d/security.list":
-             source => "puppet:///files/etc/apt/sources.list.d/security.list",
+             content => template("debian-org/etc/apt/sources.list.d/security.list.erb"),
              notify  => Exec["apt-get update"];
       "/etc/apt/sources.list.d/volatile.list":
-             source => "puppet:///files/etc/apt/sources.list.d/volatile.list",
+             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";
@@ -68,17 +68,21 @@ class debian-org {
              source => "puppet:///files/etc/timezone",
              notify => Exec["dpkg-reconfigure tzdata -pcritical -fnoninteractive"];
       "/etc/puppet/puppet.conf":
+             require => Package["puppet"],
              source => "puppet:///files/etc/puppet/puppet.conf"
              ;
       "/etc/default/puppet":
+             require => Package["puppet"],
              source => "puppet:///files/etc/default/puppet"
              ;
 
       "/etc/syslog-ng/syslog-ng.conf":
-             source => "puppet:///files/etc/syslog-ng/syslog-ng.conf",
+             content => template("syslog-ng.conf.erb"),
+             require => Package["syslog-ng"],
              notify  => Exec["syslog-ng reload"],
              ;
       "/etc/logrotate.d/syslog-ng":
+             require => Package["syslog-ng"],
              source => "puppet:///files/etc/logrotate.d/syslog-ng",
              ;
       "/etc/cron.d/dsa-puppet-stuff":
@@ -86,9 +90,11 @@ class debian-org {
              require => Package["cron"]
              ;
       "/etc/ldap/ldap.conf":
+             require => Package["userdir-ldap"],
              source => "puppet:///files/etc/ldap/ldap.conf",
              ;
       "/etc/pam.d/common-session":
+             require => Package["libpam-pwdfile"],
              source => "puppet:///files/etc/pam.d/common-session",
              ;
    }
@@ -147,7 +153,7 @@ class debian-proliant inherits debian-org {
    }
    file {
       "/etc/apt/sources.list.d/debian.restricted.list":
-             source => "puppet:///files/etc/apt/sources.list.d/debian.restricted.list",
+             content => template("debian-org/etc/apt/sources.list.d/debian.restricted.list.erb"),
              notify  => Exec["apt-get update"];
    }
 }