X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=5edef0db38e1cf01086d5b1fc84dd1347f7419e0;hb=5225ae8b10af48b44141003688115c10d5f969a1;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..5edef0db3 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -20,32 +20,34 @@ 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;
+        "puppet": 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":
@@ -142,6 +144,8 @@ class debian-org {
         "procps restart":
             path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
             refreshonly => true;
+        "init q":
+            refreshonly => true;
     }
 }