X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=6777085c51f6f87e7f4e4d73774964500c070a8e;hb=9e7faeb499d6d25e7b021958ece4c6b7855aedaf;hp=408888719f0d1d5307e2e5480b937e0726b92308;hpb=2c59bb26f503cede334348a3c3b8e4a358cc480c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 408888719..6777085c5 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;
@@ -8,7 +9,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;
@@ -22,36 +22,85 @@ 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":
              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"];
+             source => "puppet:///files/etc/puppet/puppet.conf"
+             ;
       "/etc/default/puppet":
-             source => "puppet:///files/etc/default/puppet",
-             notify  => Exec["puppet restart"];
+             source => "puppet:///files/etc/default/puppet"
+             ;
+
+      "/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"]
+             ;
+      "/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: {
+            file {
+               "/etc/puppet/lib":
+                      ensure  => directory,
+                      source => "puppet:///files/etc/puppet/lib",
+                      recurse => true,
+                      notify  => Exec["puppetmaster restart"];
+            }
+        }
+        default: {}
    }
-   exec { "puppet reload":
+
+   exec { "syslog-ng reload":
              path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
              refreshonly => true,
    }
-   exec { "puppet restart":
+   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
+   }
+   exec { "puppetmaster restart":
              path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
              refreshonly => true,
    }
@@ -65,6 +114,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"];
    }
 }