X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=ec923781ee1a04df9e523488a5ac38d1188ad29d;hb=69ca4db8fbd9ccb441dfffefbbc234c292bfe0ae;hp=b8a8f8da14b6877a5ea2e6d94ac0e6f95292946c;hpb=247088cf74ce3a0cd4d75dbe02891ad9d93dacb1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index b8a8f8da1..ec923781e 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -1,78 +1,48 @@
 class debian-org {
    package { "userdir-ldap": ensure => latest;
-             "zsh": ensure => latest;
-             "tcsh": ensure => latest;
-             "pdksh": ensure => latest;
-             "ksh": ensure => latest;
-             "csh": ensure => latest;
-             "ntp": ensure => latest;
-             "locales-all": ensure => latest;
-             "sudo": ensure => latest;
-             "libpam-pwdfile": ensure => latest;
-             "vim": ensure => latest;
-             "gnupg": ensure => latest;
-             "bzip2": ensure => latest;
-             "less": ensure => latest;
-             "ed": ensure => latest;
-             "puppet": ensure => latest;
-             "mtr-tiny": ensure => latest;
-             "nload": ensure => latest;
-             "pciutils": ensure => latest;
-             "bash-completion": ensure => latest;
+             "zsh": ensure => installed;
+             "apt-utils": ensure => installed;
+             "tcsh": ensure => installed;
+             "pdksh": ensure => installed;
+             "ksh": ensure => installed;
+             "csh": ensure => installed;
+             "ntp": ensure => installed;
+             "locales-all": ensure => installed;
+             "sudo": ensure => installed;
+             "libpam-pwdfile": ensure => installed;
+             "vim": ensure => installed;
+             "gnupg": ensure => installed;
+             "bzip2": ensure => installed;
+             "less": ensure => installed;
+             "ed": ensure => installed;
+             "puppet": ensure => installed;
+             "mtr-tiny": ensure => installed;
+             "nload": ensure => installed;
+             "pciutils": ensure => installed;
+             "dnsutils": ensure => installed;
+             "bash-completion": ensure => installed;
              "dsa-nagios-nrpe-config": ensure => latest;
+             "libfilesystem-ruby1.8": ensure => installed;
    }
    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":
+             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"];
    }
@@ -88,16 +58,12 @@ class debian-org {
 
 class debian-proliant inherits debian-org {
    package {
-      "hpacucli": ensure => latest;
-      "cpqarrayd": ensure => latest;
-      "arrayprobe": ensure => latest;
+      "hpacucli": ensure => installed;
+      "cpqarrayd": ensure => installed;
+      "arrayprobe": ensure => installed;
    }
    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";
    }
 }