From c82da35202608f408d60e3f189bfb5660bcd91dd Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Mon, 30 Apr 2012 20:19:41 +0100 Subject: [PATCH] a little more mucking about with the buildd repo Signed-off-by: Stephen Gran --- modules/buildd/manifests/init.pp | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp index e41e5ac41..0835e5717 100644 --- a/modules/buildd/manifests/init.pp +++ b/modules/buildd/manifests/init.pp @@ -1,19 +1,20 @@ class buildd { - # sigh, sort this mess out, kids - if $::lsbdistcodename in [lenny,squeeze] { - package { 'schroot': - ensure => installed, - } - } else { - package { 'schroot': } + package { [ + 'schroot', + 'sbuild' + ]: + ensure => installed, + require => [ + File['etc/apt/sources.list.d/buildd.debian.org.list'], + Exec['apt-get update'] + ] } package { 'apt-transport-https': ensure => installed, } package { [ - 'sbuild', 'debootstrap', 'dupload' ]: @@ -36,14 +37,17 @@ class buildd { require => Package['apt-transport-https'], } - # "bad" extension + # 'bad' extension file { '/etc/apt/preferences.d/buildd.debian.org': ensure => absent, } + file { '/etc/apt/preferences.d': + ensure => directory, + mode => '0755' + } file { '/etc/apt/preferences.d/buildd': content => template('buildd/etc/apt/preferences.d/buildd'), - before => File["/etc/apt/sources.list.d/buildd.debian.org.list"], - ; + before => File['etc/apt/sources.list.d/buildd.debian.org.list'] } file { '/etc/schroot/mount-defaults': content => template('buildd/etc/schroot/mount-defaults.erb'), -- 2.20.1