Limit nfs firewall ports to certain ranges

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

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index e3b2b58..053b61a 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -101,6 +101,7 @@ class debian-org {
 
        file { '/etc/apt/trusted-keys.d':
                ensure => absent,
+               force  => true,
        }
 
        file { '/etc/apt/trusted.gpg':
@@ -142,7 +143,7 @@ class debian-org {
                url        => 'http://db.debian.org/debian-admin',
                suite      => 'lenny',
                components => 'main',
-               key        => 'puppet:///modules/debian-org/db.debian.org.asc',
+               key        => 'puppet:///modules/debian-org/db.debian.org.gpg',
        }
 
        augeas { 'inittab_replicate':
@@ -179,10 +180,6 @@ class debian-org {
        file { '/etc/apt/preferences':
                source => 'puppet:///modules/debian-org/apt.preferences',
        }
-       file { '/etc/apt/trusted-keys.d/':
-               ensure => directory,
-               purge  => true,
-       }
        file { '/etc/apt/apt.conf.d/local-compression':
                source => 'puppet:///modules/debian-org/apt.conf.d/local-compression',
        }