X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=be3e3e059813dbc911095abf48777ecb6489fa23;hb=d218537383e0fc85db96bf101442d0f68d0a1caa;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..be3e3e059 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,9 @@ 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",
+             notify => Exec["dpkg-reconfigure tzdata -pcritical -fnoninteractive"];
       "/etc/puppet/puppet.conf":
              source => "puppet:///files/etc/puppet/puppet.conf",
              notify  => Exec["puppet reload"];
@@ -46,14 +47,35 @@ class debian-org {
              source => "puppet:///files/etc/default/puppet",
              notify  => Exec["puppet restart"];
    }
+   case $hostname {
+        handel: {
+            file {
+               "/etc/puppet/lib":
+                      ensure  => directory,
+                      source => "puppet:///files/etc/puppet/lib",
+                      recurse => true,
+                      notify  => Exec["puppetmaster restart"];
+            }
+        }
+        default: {}
+   }
+
    exec { "puppet reload":
              path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
              refreshonly => true,
    }
+   exec { "puppetmaster restart":
+             path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+             refreshonly => true,
+   }
    exec { "puppet restart":
              path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
              refreshonly => true,
    }
+   exec { "dpkg-reconfigure tzdata -pcritical -fnoninteractive":
+           path        => "/usr/bin:/usr/sbin:/bin:/sbin",
+           refreshonly => true,
+        }
 }
 
 class debian-proliant inherits debian-org {