X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=b8a8f8da14b6877a5ea2e6d94ac0e6f95292946c;hb=49e6bfe2dcf619c24dd1c9fe02b336aa8c10efb1;hp=fcd17dd39b09c72af0829aa846a684dff8f03475;hpb=aa7bc16840c55f814e363a5420852dae74bc0960;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index fcd17dd39..b8a8f8da1 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -17,53 +17,61 @@ class debian-org {
              "puppet": ensure => latest;
              "mtr-tiny": ensure => latest;
              "nload": ensure => latest;
+             "pciutils": ensure => latest;
+             "bash-completion": ensure => latest;
              "dsa-nagios-nrpe-config": ensure => latest;
    }
    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    => 644,
+             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    => 644,
+             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    => 644,
+             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    => 644,
+             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    => 644,
+             mode    => 444,
              ensure  => file,
              source => "puppet:///files/etc/apt/apt.conf.d/local-recommends";
       "/etc/puppet/puppet.conf":
              owner   => root,
              group   => root,
-             mode    => 644,
+             mode    => 444,
              ensure  => file,
              source => "puppet:///files/etc/puppet/puppet.conf",
              notify  => Exec["puppet reload"];
       "/etc/default/puppet":
              owner   => root,
              group   => root,
-             mode    => 644,
+             mode    => 444,
              ensure  => file,
              source => "puppet:///files/etc/default/puppet",
              notify  => Exec["puppet restart"];
@@ -81,12 +89,14 @@ class debian-org {
 class debian-proliant inherits debian-org {
    package {
       "hpacucli": ensure => latest;
+      "cpqarrayd": ensure => latest;
+      "arrayprobe": ensure => latest;
    }
    file {
       "/etc/apt/sources.list.d/debian.restricted.list":
              owner   => root,
              group   => root,
-             mode    => 644,
+             mode    => 444,
              ensure  => file,
              source => "puppet:///files/etc/apt/sources.list.d/debian.restricted.list";
    }