so many comment chars

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index ab6b05a2c8231d77543d38eadb2c1b58b75d1400..c9af7e6d4eeceb157c6261f79e696533611ecb6a 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -2,18 +2,26 @@ 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,
+               }
+       #} else {
+       #       package { 'schroot': ensure => held }
        }
 
+       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': }
@@ -23,12 +31,19 @@ class 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',
+               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'),