Try this

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 6bd381e104576f409669928ff55f72dc891227f1..e41e5ac4101105f77d7acd48a1693166235ff5fd 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -2,21 +2,26 @@ class buildd {
 
        # sigh, sort this mess out, kids
        if $::lsbdistcodename in [lenny,squeeze] {
-               package { 'schroot': ensure => installed }
+               package { 'schroot':
+                       ensure => installed,
+               }
        } else {
-               package { 'schroot': ensure => held }
+               package { 'schroot': }
        }
 
        package { 'apt-transport-https':
                ensure => installed,
-               stage  => setup,
        }
        package { [
                        'sbuild',
                        'debootstrap',
                        'dupload'
                ]:
-               ensure => installed
+               ensure => installed,
+               require => [
+                       File['/etc/apt/sources.list.d/db.debian.org.list'],
+                       Exec['apt-get update']
+               ]
        }
 
        site::linux_module { 'dm_snapshot': }
@@ -31,8 +36,14 @@ class buildd {
                require  => Package['apt-transport-https'],
        }
 
+       # "bad" extension
+       file { '/etc/apt/preferences.d/buildd.debian.org':
+               ensure => absent,
+       }
        file { '/etc/apt/preferences.d/buildd':
-               ensure  => absent
+               content => template('buildd/etc/apt/preferences.d/buildd'),
+               before  => File["/etc/apt/sources.list.d/buildd.debian.org.list"],
+               ;
        }
        file { '/etc/schroot/mount-defaults':
                content => template('buildd/etc/schroot/mount-defaults.erb'),