no more lenny

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 79065a17c45a28aa501df88b96bc9c3ee90f3c4a..63c5cf8acc24b49e2e750286f1f3a5b9bca0a62a 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,19 +1,28 @@
 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'
+               ]:
+               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',
-                       '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': }
@@ -25,10 +34,16 @@ 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'),