X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=7a05fbf966a69751c6af539e951f24f8a1693716;hb=05a760c0094fda6c23cab7d3b2e03e5a48da4223;hp=0b3c6cb21b77114fcc12d8170161d1b871333223;hpb=cba7f7a30f6d30cddb1396e500402f753d1a67f2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 0b3c6cb21..7a05fbf96 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -57,6 +57,29 @@ class debian-org {
              group   => root,
              mode    => 644,
              ensure  => file,
-             source => "puppet:///files/etc/puppet/puppet.conf";
+             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";
    }
 }