some tidy up

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 87ea915c98715225f56f60e84f42f9889ed3bdc8..2786d35072b582da9a2e0adddc60a8915368567f 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -22,11 +22,18 @@ class buildd ($ensure=present) {
        package { 'apt-transport-https':
                ensure => $package_ensure,
        }
-       package { [
-                       'debootstrap',
-                       'dupload'
-               ]:
-               ensure => installed,
+       if $ensure == present {
+               package { [
+                               'debootstrap',
+                               'dupload'
+                       ]:
+                       ensure => installed,
+               }
+               file { '/etc/dupload.conf':
+                       ensure  => $ensure,
+                       source  => 'puppet:///modules/buildd/dupload.conf',
+                       require => Package['dupload'],
+               }
        }
 
        site::linux_module { 'dm_snapshot':
@@ -93,11 +100,6 @@ class buildd ($ensure=present) {
                source  => 'puppet:///modules/buildd/cron.d-dsa-buildd',
                require => Package['debian.org']
        }
-       file { '/etc/dupload.conf':
-               ensure  => $ensure,
-               source  => 'puppet:///modules/buildd/dupload.conf',
-               require => Package['dupload'],
-       }
        file { '/etc/default/schroot':
                ensure  => $ensure,
                source  => 'puppet:///modules/buildd/default-schroot',