So, this works slightly differently than I had thought. In addition to

[mirror/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 753f852..7a05fbf 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -15,8 +15,71 @@ class debian-org {
              "less": ensure => latest;
              "ed": ensure => latest;
              "puppet": ensure => latest;
-
+             "mtr-tiny": ensure => latest;
+             "nload": ensure => latest;
    }
+   file {
+      "/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/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 reload"];
+   }
+   exec { "puppet reload":
+             path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+             refreshonly => true,
+   }
 }
 
+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";
+   }
+}