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

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index ec923781e..befbcf377 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -8,7 +8,6 @@ class debian-org {
              "csh": ensure => installed;
              "ntp": ensure => installed;
              "locales-all": ensure => installed;
-             "sudo": ensure => installed;
              "libpam-pwdfile": ensure => installed;
              "vim": ensure => installed;
              "gnupg": ensure => installed;
@@ -21,7 +20,6 @@ class debian-org {
              "pciutils": ensure => installed;
              "dnsutils": ensure => installed;
              "bash-completion": ensure => installed;
-             "dsa-nagios-nrpe-config": ensure => latest;
              "libfilesystem-ruby1.8": ensure => installed;
    }
    file {
@@ -39,6 +37,8 @@ class debian-org {
              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/timezone":
+             source => "puppet:///files/etc/timezone";
       "/etc/puppet/puppet.conf":
              source => "puppet:///files/etc/puppet/puppet.conf",
              notify  => Exec["puppet reload"];