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 161238b400cde7dcf4a440b391711dc52eeb7615..c9af7e6d4eeceb157c6261f79e696533611ecb6a 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -4,13 +4,9 @@ class buildd {
        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 }
+       #} else {
+       #       package { 'schroot': ensure => held }
        }
 
        package { 'apt-transport-https':
@@ -40,8 +36,14 @@ class buildd {
                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'),