Add default File template and remove lots of boilerplate

[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 876f90c4421d3ae8e1e97798a2e34bfa1eaf0ae4..23d39a79803cc265d5e8d643d61733b7e25dcc45 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -25,62 +25,23 @@ class debian-org {
    }
    file {
       "/etc/apt/preferences":
-             owner   => root,
-             group   => root,
-             mode    => 444,
-             ensure  => file,
              source => "puppet:///files/etc/apt/preferences";
       "/etc/apt/sources.list.d/backports.org.list":
-             owner   => root,
-             group   => root,
-             mode    => 444,
-             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    => 444,
-             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    => 444,
-             ensure  => file,
              source => "puppet:///files/etc/apt/sources.list.d/security.list";
-
       "/etc/apt/sources.list.d/volatile.list":
-             owner   => root,
-             group   => root,
-             mode    => 444,
-             ensure  => file,
              source => "puppet:///files/etc/apt/sources.list.d/volatile.list";
       "/etc/apt/apt.conf.d/local-recommends":
-             owner   => root,
-             group   => root,
-             mode    => 444,
-             ensure  => file,
              source => "puppet:///files/etc/apt/apt.conf.d/local-recommends";
       "/etc/apt/apt.conf.d/local-pdiffs":
-             owner   => root,
-             group   => root,
-             mode    => 444,
-             ensure  => file,
              source => "puppet:///files/etc/apt/apt.conf.d/local-pdiffs";
       "/etc/puppet/puppet.conf":
-             owner   => root,
-             group   => root,
-             mode    => 444,
-             ensure  => file,
              source => "puppet:///files/etc/puppet/puppet.conf",
              notify  => Exec["puppet reload"];
       "/etc/default/puppet":
-             owner   => root,
-             group   => root,
-             mode    => 444,
-             ensure  => file,
              source => "puppet:///files/etc/default/puppet",
              notify  => Exec["puppet restart"];
    }
@@ -102,10 +63,6 @@ class debian-proliant inherits debian-org {
    }
    file {
       "/etc/apt/sources.list.d/debian.restricted.list":
-             owner   => root,
-             group   => root,
-             mode    => 444,
-             ensure  => file,
              source => "puppet:///files/etc/apt/sources.list.d/debian.restricted.list";
    }
 }