simplify site::aptrepo

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 364267a716a6d4184625288774998f317f175e9d..ab6b05a2c8231d77543d38eadb2c1b58b75d1400 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -17,13 +17,14 @@ class buildd {
        }
 
        site::linux_module { 'dm_snapshot': }
+       ferm::module { 'nf_conntrack_ftp': }
 
        site::aptrepo { 'buildd':
                ensure => absent,
        }
        site::aptrepo { 'buildd.debian.org':
-               template => 'buildd/etc/apt/sources.list.d/buildd.list.erb',
-               key      => 'puppet:///modules/buildd/buildd.debian.org.asc',
+               content => template('buildd/etc/apt/sources.list.d/buildd.list.erb'),
+               key     => 'puppet:///modules/buildd/buildd.debian.org.asc',
        }
 
        file { '/etc/apt/preferences.d/buildd':