Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

[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 c58c8d94afef460c0d94bb599f3cb26756082790..4dca10d0c27315a91f96dfa41b960942218df280 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -25,7 +25,6 @@ class debian-org {
              "pdksh": ensure => installed;
              "ksh": ensure => installed;
              "csh": ensure => installed;
-             "ntp": ensure => installed;
              "locales-all": ensure => installed;
              "libpam-pwdfile": ensure => installed;
              "vim": ensure => installed;
@@ -49,16 +48,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";
@@ -153,7 +152,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"];
    }
 }