X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=37c98fb0adf67fa4b14431ea8126a9532d29b919;hb=930c30d7e60f474908e27fd12429353ee7c226fa;hp=de1b4a6a6b927b275efc7ee1193637cc3293d4bd;hpb=70e91671959c012d08e45f195c9feacbe7d39f5f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index de1b4a6a6..37c98fb0a 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 => installed;
              "zsh": ensure => installed;
+             "cron": ensure => installed;
              "apt-utils": ensure => installed;
              "tcsh": ensure => installed;
              "pdksh": ensure => installed;
@@ -53,7 +54,7 @@ class debian-org {
              notify  => Exec["puppet reload"];
       "/etc/default/puppet":
              source => "puppet:///files/etc/default/puppet",
-             notify  => Exec["puppet restart"];
+             require => Exec["puppet stop"];
 
       "/etc/syslog-ng/syslog-ng.conf":
              source => "puppet:///files/etc/syslog-ng/syslog-ng.conf",
@@ -62,6 +63,16 @@ class debian-org {
       "/etc/logrotate.d/syslog-ng":
              source => "puppet:///files/etc/logrotate.d/syslog-ng",
              ;
+      "/etc/cron.d/dsa-puppet-stuff":
+             source => "puppet:///files/etc/cron.d/dsa-puppet-stuff",
+             require => Package["cron"]
+             ;
+      "/etc/ldap/ldap.conf":
+             source => "puppet:///files/etc/ldap/ldap.conf",
+             ;
+      "/etc/pam.d/common-session":
+             source => "puppet:///files/etc/pam.d/common-session",
+             ;
    }
    case $hostname {
         handel: {
@@ -84,7 +95,7 @@ class debian-org {
              path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
              refreshonly => true,
    }
-   exec { "puppet restart":
+   exec { "puppet stop":
              path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
              refreshonly => true,
    }