X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=408888719f0d1d5307e2e5480b937e0726b92308;hb=5a40c34e0e576183b800c6981826a6c3a444c13b;hp=b77dcd63086248b2ff5b5845baf1cbd261a67aa9;hpb=52c5719778ef59be012da71b2f996d28954bf701;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index b77dcd630..408888719 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -1,6 +1,7 @@
 class debian-org {
    package { "userdir-ldap": ensure => latest;
              "zsh": ensure => installed;
+             "apt-utils": ensure => installed;
              "tcsh": ensure => installed;
              "pdksh": ensure => installed;
              "ksh": ensure => installed;
@@ -20,7 +21,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 {
@@ -38,6 +38,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"];