manual dependencies

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 0993a1d..161238b 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,15 +1,35 @@
 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 { 'apt-transport-https':
+               ensure => installed,
+       }
        package { [
-                       'schroot',
                        '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': }
+       ferm::module { 'nf_conntrack_ftp': }
 
        site::aptrepo { 'buildd':
                ensure => absent,
@@ -17,6 +37,7 @@ class buildd {
        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'],
        }
 
        file { '/etc/apt/preferences.d/buildd':