From ae0af8fdaba9c6e9e5396ec8f9b93aeeca7f21bf Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sun, 3 Mar 2013 07:38:28 +0000 Subject: [PATCH] some tidy up Signed-off-by: Stephen Gran --- modules/buildd/manifests/init.pp | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp index 87ea915c..2786d350 100644 --- 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', -- 2.39.2