X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=34415ecf6e4a3195f2fe1dc7a6f2258463eea943;hb=10798926214f5796ff758ff8a84c01b19647e598;hp=9198330643a4190613f68c405a7ceaa16a8db4d7;hpb=99e1401c9f302fe6f2d4027fa13818c4fd2972cb;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 919833064..34415ecf6 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -26,6 +26,7 @@ class debian-org {
         "cron": ensure => installed;
         "csh": ensure => installed;
         "dnsutils": ensure => installed;
+        "dsa-munin-plugins": ensure => installed;
         "ed": ensure => installed;
         "gnupg": ensure => installed;
         "klogd": ensure => purged;
@@ -38,7 +39,6 @@ class debian-org {
         "nload": ensure => installed;
         "pciutils": ensure => installed;
         "pdksh": ensure => installed;
-        "puppet": ensure => installed;
         "rsyslog": ensure => purged;
         "sysklogd": ensure => purged;
         "syslog-ng": ensure => installed;
@@ -46,6 +46,7 @@ class debian-org {
         "userdir-ldap": ensure => installed;
         "vim": ensure => installed;
         "zsh": ensure => installed;
+        "logrotate": ensure => installed;
     }
     file {
         "/etc/apt/preferences":
@@ -63,41 +64,37 @@ class debian-org {
             content => template("debian-org/etc/apt/sources.list.d/volatile.list.erb"),
             notify  => Exec["apt-get update"];
         "/etc/apt/apt.conf.d/local-recommends":
-            source => "puppet:///files/etc/apt/apt.conf.d/local-recommends";
+            source => "puppet:///modules/debian-org/apt.conf.d/local-recommends";
         "/etc/apt/apt.conf.d/local-pdiffs":
-            source => "puppet:///files/etc/apt/apt.conf.d/local-pdiffs";
+            source => "puppet:///modules/debian-org/apt.conf.d/local-pdiffs";
         "/etc/timezone":
             source => "puppet:///files/etc/timezone",
             notify => Exec["dpkg-reconfigure tzdata -pcritical -fnoninteractive"];
         "/etc/puppet/puppet.conf":
-            require => Package["puppet"],
+            # require => Package["puppet"],
             source => "puppet:///files/etc/puppet/puppet.conf"
             ;
         "/etc/default/puppet":
-            require => Package["puppet"],
-            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",
+            # require => Package["puppet"],
+            source => "puppet:///modules/debian-org/puppet.default"
             ;
+
         "/etc/cron.d/dsa-puppet-stuff":
-            source => "puppet:///files/etc/cron.d/dsa-puppet-stuff",
+            source => "puppet:///modules/debian-org/dsa-puppet-stuff.cron",
             require => Package["cron"]
             ;
         "/etc/ldap/ldap.conf":
             require => Package["userdir-ldap"],
-            source => "puppet:///files/etc/ldap/ldap.conf",
+            source => "puppet:///modules/debian-org/ldap.conf",
             ;
         "/etc/pam.d/common-session":
             require => Package["libpam-pwdfile"],
-            source => "puppet:///files/etc/pam.d/common-session",
+            source => "puppet:///modules/debian-org/pam.common-session",
+            ;
+        "/etc/rc.local":
+            mode   => 0755,
+            source => "puppet:///modules/debian-org/rc.local",
+            notify => Exec["rc.local start"],
             ;
     }
     case $hostname {
@@ -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;
     }
 }