Merge branch 'master' of git+ssh://zobel@handel.debian.org/srv/puppet.debian.org...

[dsa-puppet.git] / modules / debian-org / manifests / init.pp

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 408888719f0d1d5307e2e5480b937e0726b92308..9612a6f573f5931f23d9cab562d28c2ef4a15f6a 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -1,5 +1,5 @@
 class debian-org {
-   package { "userdir-ldap": ensure => latest;
+   package { "userdir-ldap": ensure => installed;
              "zsh": ensure => installed;
              "apt-utils": ensure => installed;
              "tcsh": ensure => installed;
@@ -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;
@@ -39,7 +38,8 @@ class debian-org {
       "/etc/apt/apt.conf.d/local-pdiffs":
              source => "puppet:///files/etc/apt/apt.conf.d/local-pdiffs";
       "/etc/timezone":
-             source => "puppet:///files/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"];
@@ -47,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 {