an aptitude killer for squeeze

[dsa-puppet.git] / modules / buildd / manifests / init.pp

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 6b6e7162d6900704b327fd585fd5152364dc9538..ec575bf8470b7b51d91e5a37f4ce1834903827a8 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -82,11 +82,16 @@ class buildd ($ensure=present) {
                        ensure => installed,
                }
                file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
-                       source  => 'puppet:///modules/buildd/dupload.conf',
+                       source  => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill',
                        mode    => '0555',
                }
-               file { '/etc/cron.d/puppet-buildd-aptitude':
-                       content => "*/5 * * * * root /usr/local/sbin/buildd-schroot-aptitude-kill\n",
+       } else {
+               file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
+                       source  => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill.squeeze',
+                       mode    => '0555',
                }
        }
+       file { '/etc/cron.d/puppet-buildd-aptitude':
+               content => "*/5 * * * * root /usr/local/sbin/buildd-schroot-aptitude-kill\n",
+       }
 }