X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=0bccab42c9a2505618f2ee06542cf0962433c0e0;hb=3991b58d75af1df32e7674235e83bd44938301c1;hp=4417bfd5785b953106aea900d4e0d5b202a26c22;hpb=c3ac7edbf4f5bab8820a046e6d5dbf89e11fda1f;p=dsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 4417bfd5..0bccab42 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -102,10 +102,12 @@ class debian-org {
 	file { '/etc/apt/trusted-keys.d':
 		ensure => absent,
 	}
-	file { '/etc/apt/trusted.gpg',
+
+	file { '/etc/apt/trusted.gpg':
 		mode    => '0600',
 		content => "",
 	}
+
 	site::aptrepo { 'security':
 		url        => 'http://security.debian.org/',
 		suite      => "${::lsbdistcodename}/updates",
@@ -177,10 +179,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',
 	}