X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=23d39a79803cc265d5e8d643d61733b7e25dcc45;hb=19e1deb652a7911e33d4e1504720eb3ad9a431ec;hp=5806ab1899d680a147102ef521377f32fee72f71;hpb=af6aa06bdf341ed66fdbb17eed8a4c77ae71b75f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 5806ab189..23d39a798 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -18,55 +18,30 @@ class debian-org {
              "mtr-tiny": ensure => latest;
              "nload": ensure => latest;
              "pciutils": ensure => latest;
+             "dnsutils": ensure => latest;
              "bash-completion": ensure => latest;
              "dsa-nagios-nrpe-config": ensure => latest;
+             "libfilesystem-ruby1.8": ensure => latest;
    }
    file {
+      "/etc/apt/preferences":
+             source => "puppet:///files/etc/apt/preferences";
       "/etc/apt/sources.list.d/backports.org.list":
-             owner   => root,
-             group   => root,
-             mode    => 644,
-             ensure  => file,
              source => "puppet:///files/etc/apt/sources.list.d/backports.org.list";
-
       "/etc/apt/sources.list.d/debian.org.list":
-             owner   => root,
-             group   => root,
-             mode    => 644,
-             ensure  => file,
              source => "puppet:///files/etc/apt/sources.list.d/debian.org.list";
-
       "/etc/apt/sources.list.d/security.list":
-             owner   => root,
-             group   => root,
-             mode    => 644,
-             ensure  => file,
              source => "puppet:///files/etc/apt/sources.list.d/security.list";
-
       "/etc/apt/sources.list.d/volatile.list":
-             owner   => root,
-             group   => root,
-             mode    => 644,
-             ensure  => file,
              source => "puppet:///files/etc/apt/sources.list.d/volatile.list";
       "/etc/apt/apt.conf.d/local-recommends":
-             owner   => root,
-             group   => root,
-             mode    => 644,
-             ensure  => file,
              source => "puppet:///files/etc/apt/apt.conf.d/local-recommends";
+      "/etc/apt/apt.conf.d/local-pdiffs":
+             source => "puppet:///files/etc/apt/apt.conf.d/local-pdiffs";
       "/etc/puppet/puppet.conf":
-             owner   => root,
-             group   => root,
-             mode    => 644,
-             ensure  => file,
              source => "puppet:///files/etc/puppet/puppet.conf",
              notify  => Exec["puppet reload"];
       "/etc/default/puppet":
-             owner   => root,
-             group   => root,
-             mode    => 644,
-             ensure  => file,
              source => "puppet:///files/etc/default/puppet",
              notify  => Exec["puppet restart"];
    }
@@ -88,10 +63,6 @@ class debian-proliant inherits debian-org {
    }
    file {
       "/etc/apt/sources.list.d/debian.restricted.list":
-             owner   => root,
-             group   => root,
-             mode    => 644,
-             ensure  => file,
              source => "puppet:///files/etc/apt/sources.list.d/debian.restricted.list";
    }
 }