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 8f2065de47e8d4ad508626f0f4f4e05c9558c702..e41e5ac4101105f77d7acd48a1693166235ff5fd 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -2,22 +2,30 @@ 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,
+       }
        package { [
                        'sbuild',
-                       'apt-transport-https',
                        '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': }
-       ferm::module { 'ftp_conntrack': }
+       ferm::module { 'nf_conntrack_ftp': }
 
        site::aptrepo { 'buildd':
                ensure => absent,
@@ -25,10 +33,17 @@ class buildd {
        site::aptrepo { 'buildd.debian.org':
                template => 'buildd/etc/apt/sources.list.d/buildd.list.erb',
                key      => 'puppet:///modules/buildd/buildd.debian.org.asc',
+               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'),