simplify site::aptrepo

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 01dca34d5b315b03a4238547d82b90b34743ff3b..ab6b05a2c8231d77543d38eadb2c1b58b75d1400 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,6 +1,13 @@
 class buildd {
+
+       # sigh, sort this mess out, kids
+       if $::lsbdistcodename in [lenny,squeeze] {
+               package { 'schroot': ensure => installed }
+       } else {
+               package { 'schroot': ensure => held }
+       }
+
        package { [
-                       'schroot',
                        'sbuild',
                        'apt-transport-https',
                        'debootstrap',
@@ -10,8 +17,12 @@ class buildd {
        }
 
        site::linux_module { 'dm_snapshot': }
+       ferm::module { 'nf_conntrack_ftp': }
 
        site::aptrepo { 'buildd':
+               ensure => absent,
+       }
+       site::aptrepo { 'buildd.debian.org':
                content => template('buildd/etc/apt/sources.list.d/buildd.list.erb'),
                key     => 'puppet:///modules/buildd/buildd.debian.org.asc',
        }
@@ -23,10 +34,6 @@ class buildd {
                content => template('buildd/etc/schroot/mount-defaults.erb'),
                require => Package['sbuild'],
        }
-       file { '/etc/schroot/mount-defaults':
-               content => template('buildd/etc/schroot/mount-defaults.erb'),
-               require => Package['sbuild'],
-       }
        file { '/etc/cron.d/dsa-buildd':
                source  => 'puppet:///modules/buildd/cron.d-dsa-buildd',
                require => Package['debian.org']