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 4ded440f79d2dc5214722c51c4d6a354d777c99d..3a9d5087aa50b6d306cc038340f6b9b7a1605789 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,13 +1,17 @@
 class buildd {
 
-       package { [
-                       'schroot',
-                       'sbuild'
-               ]:
-               ensure  => installed,
-               require => [
-                       Exec['apt-get update']
-               ]
+       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':
@@ -34,15 +38,12 @@ class buildd {
                default => 'wheezy'
        }
 
-       if $suite == 'squeeze' {
-               site::aptrepo { 'buildd.debian.org':
-                       key        => 'puppet:///modules/buildd/buildd.debian.org.asc',
-                       url        => 'https://buildd.debian.org/apt/',
-                       suite      => $suite,
-                       components => 'main',
-                       require    => Package['apt-transport-https'],
-                       before     => Package[schroot,sbuild]
-               }
+       site::aptrepo { 'buildd.debian.org':
+               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] {
@@ -69,7 +70,7 @@ class buildd {
        }
        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'),