the right module name helps

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 0993a1dc08f112501be7c78c65c57bde31b3af83..79065a17c45a28aa501df88b96bc9c3ee90f3c4a 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,6 +1,13 @@
 class buildd {
+
+       # sigh, sort this mess out, kids
+       if $::lsbdistcodename in [lenny,squeeze] {
+               package { 'schroot': ensure => installed }
+       } else {
+               package { 'schroot': ensure => held }
+       }
+
        package { [
-                       'schroot',
                        'sbuild',
                        'apt-transport-https',
                        'debootstrap',
@@ -10,6 +17,7 @@ class buildd {
        }
 
        site::linux_module { 'dm_snapshot': }
+       ferm::module { 'nf_conntrack_ftp': }
 
        site::aptrepo { 'buildd':
                ensure => absent,