X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=d3a2187e3eb050fdd6450146fb30d4aac2013dba;hb=f5f115fe64b612a5a5c18bff202a43d147c2cdea;hp=e8196a70008c96d191adb92f275cdb0d6258536f;hpb=7f86914b9cb237cb1cf8c720f86902bef717cfaa;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index e8196a700..d3a2187e3 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -20,32 +20,33 @@ define set_alternatives($linkto) {
 
 class debian-org {
     package {
-        "userdir-ldap": ensure => installed;
-        "zsh": ensure => installed;
-        "cron": ensure => installed;
         "apt-utils": ensure => installed;
-        "tcsh": ensure => installed;
-        "pdksh": ensure => installed;
-        "ksh": ensure => installed;
+        "bash-completion": ensure => installed;
+        "bzip2": ensure => installed;
+        "cron": ensure => installed;
         "csh": ensure => installed;
-        "locales-all": ensure => installed;
-        "libpam-pwdfile": ensure => installed;
-        "vim": ensure => installed;
+        "dnsutils": ensure => installed;
+        "dsa-munin-plugins": ensure => installed;
+        "ed": ensure => installed;
         "gnupg": ensure => installed;
-        "bzip2": ensure => installed;
+        "klogd": ensure => purged;
+        "ksh": ensure => installed;
         "less": ensure => installed;
-        "ed": ensure => installed;
-        "puppet": ensure => installed;
+        "libfilesystem-ruby1.8": ensure => installed;
+        "libpam-pwdfile": ensure => installed;
+        "locales-all": ensure => installed;
         "mtr-tiny": ensure => installed;
         "nload": ensure => installed;
         "pciutils": ensure => installed;
-        "dnsutils": ensure => installed;
-        "bash-completion": ensure => installed;
-        "libfilesystem-ruby1.8": ensure => installed;
-        "syslog-ng": ensure => installed;
-        "sysklogd": ensure => purged;
-        "klogd": ensure => purged;
+        "pdksh": ensure => installed;
         "rsyslog": ensure => purged;
+        "sysklogd": ensure => purged;
+        "syslog-ng": ensure => installed;
+        "tcsh": ensure => installed;
+        "userdir-ldap": ensure => installed;
+        "vim": ensure => installed;
+        "zsh": ensure => installed;
+        "logrotate": ensure => installed;
     }
     file {
         "/etc/apt/preferences":
@@ -78,15 +79,6 @@ class debian-org {
             source => "puppet:///files/etc/default/puppet"
             ;
        
-        "/etc/syslog-ng/syslog-ng.conf":
-            content => template("syslog-ng.conf.erb"),
-            require => Package["syslog-ng"],
-            notify  => Exec["syslog-ng reload"],
-            ;
-        "/etc/logrotate.d/syslog-ng":
-            require => Package["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"]
@@ -99,6 +91,11 @@ class debian-org {
             require => Package["libpam-pwdfile"],
             source => "puppet:///files/etc/pam.d/common-session",
             ;
+        "/etc/rc.local":
+            mode   => 0755,
+            source => "puppet:///modules/debian-org/rc.local",
+            notify => Exec["rc.local start"],
+            ;
     }
     case $hostname {
         handel: {
@@ -126,9 +123,6 @@ class debian-org {
     }
    
     exec {
-        "syslog-ng reload":
-            path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-            refreshonly => true;
         "dpkg-reconfigure tzdata -pcritical -fnoninteractive":
             path        => "/usr/bin:/usr/sbin:/bin:/sbin",
             refreshonly => true;
@@ -139,9 +133,14 @@ class debian-org {
         "puppetmaster restart":
             path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
             refreshonly => true;
+        "rc.local start":
+            path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+            refreshonly => true;
         "procps restart":
             path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
             refreshonly => true;
+        "init q":
+            refreshonly => true;
     }
 }