Revert "now make it go away"

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 227ac261c44eaa21d0137d7512f12668cf29d14f..3a9d5087aa50b6d306cc038340f6b9b7a1605789 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,27 +1,27 @@
 class buildd {
 
-       # sigh, sort this mess out, kids
-       if $::lsbdistcodename in [lenny,squeeze] {
-               package { 'schroot':
-                       ensure => installed,
-               }
-       } else {
-               // package { 'schroot': ensure => held }
+       package { 'schroot':
+               ensure => installed,
+               tag    => extra_repo,
+       }
+       package { 'sbuild':
+               ensure => installed,
+               tag    => extra_repo,
+       }
+       package { 'libsbuild-perl':
+               ensure => installed,
+               tag    => extra_repo,
+               before => Package['sbuild']
        }
 
        package { 'apt-transport-https':
                ensure => installed,
        }
        package { [
-                       'sbuild',
                        'debootstrap',
                        'dupload'
                ]:
                ensure => installed,
-               require => [
-                       File['/etc/apt/sources.list.d/db.debian.org.list'],
-                       Exec['apt-get update']
-               ]
        }
 
        site::linux_module { 'dm_snapshot': }
@@ -30,20 +30,47 @@ class buildd {
        site::aptrepo { 'buildd':
                ensure => absent,
        }
+
+       $suite = $::lsbdistcodename ? {
+               squeeze => $::lsbdistcodename,
+               wheezy  => $::lsbdistcodename,
+               undef   => 'squeeze',
+               default => 'wheezy'
+       }
+
        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'],
+               key        => 'puppet:///modules/buildd/buildd.debian.org.asc',
+               url        => 'https://buildd.debian.org/apt/',
+               suite      => $suite,
+               components => 'main',
+               require    => Package['apt-transport-https'],
+       }
+
+       if $::hostname in [alkman,porpora,zandonai] {
+               site::aptrepo { 'buildd.debian.org-proposed':
+                       url        => 'https://buildd.debian.org/apt/',
+                       suite      => "${suite}-proposed",
+                       components => 'main',
+                       require    => Package['apt-transport-https'],
+               }
+       }
+
+       if $::hostname in [krenek] {
+               site::aptrepo { 'buildd.debian.org-experimental':
+                       url        => 'https://buildd.debian.org/apt/',
+                       suite      => "${suite}-experimental",
+                       components => 'main',
+                       require    => Package['apt-transport-https'],
+               }
        }
 
-       # "bad" extension
+       # 'bad' extension
        file { '/etc/apt/preferences.d/buildd.debian.org':
                ensure => absent,
        }
        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"],
-               ;
+               before  => Site::Aptrepo['buildd.debian.org']
        }
        file { '/etc/schroot/mount-defaults':
                content => template('buildd/etc/schroot/mount-defaults.erb'),