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 2248409ddaaae1115a7479fe14d18aca048166c6..63c5cf8acc24b49e2e750286f1f3a5b9bca0a62a 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,23 +1,20 @@
 class buildd {
 
-       # sigh, sort this mess out, kids
-       if $::lsbdistcodename in [lenny,squeeze] {
-               package { 'schroot':
-                       ensure => installed,
-                       require => [
-                               File['/etc/apt/sources.list.d/db.debian.org.list'],
-                               Exec['apt-get update']
-                       ]
-               }
-       } 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',
                        'debootstrap',
                        'dupload'
                ]:
@@ -40,14 +37,13 @@ class buildd {
                require  => Package['apt-transport-https'],
        }
 
-       file { '/etc/apt/preferences.d/buildd':
+       # 'bad' extension
+       file { '/etc/apt/preferences.d/buildd.debian.org':
                ensure => absent,
        }
-       file { '/etc/apt/preferences.d/buildd.debian.org':
-               source  => "puppet:///modules/buildd/apt-preferences",
-               content => template('buildd/etc/apt/preferences.d/buildd.debian.org'),
-               before  => File["/etc/apt/sources.list.d/buildd.list"],
-               ;
+       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']
        }
        file { '/etc/schroot/mount-defaults':
                content => template('buildd/etc/schroot/mount-defaults.erb'),