X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=ae9e504c95b2ef35bc59c705d11eb19c902c6cd2;hb=37822cb6b7be585e3eb181b916161b736d2e2358;hp=ad03165546c7bea7f6851ed19f5333f517565d10;hpb=87a84fdfcb74d1161287dd67f18d897c7d49eb28;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index ad0316554..ae9e504c9 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;
+   package { "userdir-ldap": ensure => installed;
              "zsh": ensure => installed;
+             "cron": ensure => installed;
              "apt-utils": ensure => installed;
              "tcsh": ensure => installed;
              "pdksh": ensure => installed;
@@ -21,18 +22,26 @@ class debian-org {
              "dnsutils": ensure => installed;
              "bash-completion": ensure => installed;
              "libfilesystem-ruby1.8": ensure => installed;
+             "syslog-ng": ensure => installed;
+             "sysklogd": ensure => purged;
+             "klogd": ensure => purged;
+             "rsyslog": ensure => purged;
    }
    file {
       "/etc/apt/preferences":
              source => "puppet:///files/etc/apt/preferences";
       "/etc/apt/sources.list.d/backports.org.list":
-             source => "puppet:///files/etc/apt/sources.list.d/backports.org.list";
+             source => "puppet:///files/etc/apt/sources.list.d/backports.org.list",
+             notify  => Exec["apt-get update"];
       "/etc/apt/sources.list.d/debian.org.list":
-             source => "puppet:///files/etc/apt/sources.list.d/debian.org.list";
+             source => "puppet:///files/etc/apt/sources.list.d/debian.org.list",
+             notify  => Exec["apt-get update"];
       "/etc/apt/sources.list.d/security.list":
-             source => "puppet:///files/etc/apt/sources.list.d/security.list";
+             source => "puppet:///files/etc/apt/sources.list.d/security.list",
+             notify  => Exec["apt-get update"];
       "/etc/apt/sources.list.d/volatile.list":
-             source => "puppet:///files/etc/apt/sources.list.d/volatile.list";
+             source => "puppet:///files/etc/apt/sources.list.d/volatile.list",
+             notify  => Exec["apt-get update"];
       "/etc/apt/apt.conf.d/local-recommends":
              source => "puppet:///files/etc/apt/apt.conf.d/local-recommends";
       "/etc/apt/apt.conf.d/local-pdiffs":
@@ -46,19 +55,57 @@ class debian-org {
       "/etc/default/puppet":
              source => "puppet:///files/etc/default/puppet",
              notify  => Exec["puppet restart"];
+
+      "/etc/syslog-ng/syslog-ng.conf":
+             source => "puppet:///files/etc/syslog-ng/syslog-ng.conf",
+             notify  => Exec["syslog-ng reload"],
+             ;
+      "/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"]
+             ;
+   }
+   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 { "syslog-ng reload":
+             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,
-        }
+   }
+   exec { "apt-get update":
+             command => 'apt-get update',
+             path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+             refreshonly => true
+   }
 }
 
 class debian-proliant inherits debian-org {
@@ -69,6 +116,7 @@ class debian-proliant inherits debian-org {
    }
    file {
       "/etc/apt/sources.list.d/debian.restricted.list":
-             source => "puppet:///files/etc/apt/sources.list.d/debian.restricted.list";
+             source => "puppet:///files/etc/apt/sources.list.d/debian.restricted.list",
+             notify  => Exec["apt-get update"];
    }
 }