clean up naming

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 01dca34d5b315b03a4238547d82b90b34743ff3b..0993a1dc08f112501be7c78c65c57bde31b3af83 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -12,8 +12,11 @@ class buildd {
        site::linux_module { 'dm_snapshot': }
 
        site::aptrepo { 'buildd':
-               content => template('buildd/etc/apt/sources.list.d/buildd.list.erb'),
-               key     => 'puppet:///modules/buildd/buildd.debian.org.asc',
+               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',
        }
 
        file { '/etc/apt/preferences.d/buildd':
@@ -23,10 +26,6 @@ class buildd {
                content => template('buildd/etc/schroot/mount-defaults.erb'),
                require => Package['sbuild'],
        }
-       file { '/etc/schroot/mount-defaults':
-               content => template('buildd/etc/schroot/mount-defaults.erb'),
-               require => Package['sbuild'],
-       }
        file { '/etc/cron.d/dsa-buildd':
                source  => 'puppet:///modules/buildd/cron.d-dsa-buildd',
                require => Package['debian.org']