puppet auto-upgrading packages is annoying in combination with samhain.

[mirror/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 4943c70..9612a6f 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;
@@ -46,16 +46,18 @@ class debian-org {
       "/etc/default/puppet":
              source => "puppet:///files/etc/default/puppet",
              notify  => Exec["puppet restart"];
-      case $hostname {
-           spohr: {
-      "/etc/puppet/lib":
-             ensure  => directory,
-             source => "puppet:///files/etc/puppet/lib",
-             recurse => true,
-             notify  => Exec["puppetmaster restart"];
-           }
-           default: {}
-      }
+   }
+   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":