no need to remove these

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 87ea915..307419a 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -22,18 +22,24 @@ class buildd ($ensure=present) {
        package { 'apt-transport-https':
                ensure => $package_ensure,
        }
-       package { [
-                       'debootstrap',
-                       'dupload'
-               ]:
-               ensure => installed,
-       }
-
-       site::linux_module { 'dm_snapshot':
-               ensure => $ensure
-       }
-       ferm::module { 'nf_conntrack_ftp':
-               ensure => $ensure
+       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':
+                       ensure => $ensure
+               }
+               ferm::module { 'nf_conntrack_ftp':
+                       ensure => $ensure
+               }
        }
 
        site::aptrepo { 'buildd':
@@ -93,11 +99,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',