X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=3a3c8b2f4449abb2a39a0844356bbae429330505;hb=946c66e0abd4bba8751167d5c0d4b87fe8a8d66a;hp=dbb3430a5d56feed0c99a44f7b33e381b81e0807;hpb=4e2186720c0ae90c5032b68e1f8f7bccfe3ac908;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index dbb3430a5..3a3c8b2f4 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -26,7 +26,7 @@ class debian-org {
         "cron": ensure => installed;
         "csh": ensure => installed;
         "dnsutils": ensure => installed;
-        "dsa-munin-checks": ensure => installed;
+        "dsa-munin-plugins": ensure => installed;
         "ed": ensure => installed;
         "gnupg": ensure => installed;
         "klogd": ensure => purged;
@@ -47,6 +47,7 @@ class debian-org {
         "userdir-ldap": ensure => installed;
         "vim": ensure => installed;
         "zsh": ensure => installed;
+        "logrotate": ensure => installed;
     }
     file {
         "/etc/apt/preferences":
@@ -79,15 +80,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"]
@@ -100,6 +92,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: {
@@ -127,9 +124,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;
@@ -140,9 +134,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;
     }
 }