X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssl%2Fmanifests%2Finit.pp;h=744cb468af8131aa9f2b4f65f0e9f94665e385d6;hb=0096f1f5e3d0d98dec43acb5f1699c6a8c4ecd66;hp=a63f8f7c07731d842e031f011475ac2bd252e817;hpb=fb7a6e2a3b664a91e1977a47b577a91127487a5d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index a63f8f7c0..744cb468a 100644
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -51,17 +51,11 @@ class ssl {
 	}
 
 	file { '/etc/ssl/servicecerts':
-		ensure   => link,
-		purge    => true,
-		force    => true,
-		target   => '/usr/local/share/ca-certificates/debian.org',
-		notify   => Exec['retire_debian_links'],
+		ensure   => absent,
 	}
 
 	file { '/usr/local/share/ca-certificates/debian.org':
-		ensure   => directory,
-		source   => 'puppet:///modules/ssl/servicecerts/',
-		mode     => '0644', # this works; otherwise all files are +x
+		ensure   => absent,
 		purge    => true,
 		recurse  => true,
 		force    => true,
@@ -153,12 +147,6 @@ class ssl {
 		$updatecacerts = $updatecacertsdsa
 	}
 
-	exec { 'retire_debian_links':
-		command     => 'find -lname "../servicecerts/*" -exec rm {} +',
-		cwd         => '/etc/ssl/certs',
-		refreshonly => true,
-		notify      => Exec['refresh_normal_hashes'],
-	}
 	exec { 'refresh_debian_hashes':
 		command     => 'c_rehash /etc/ssl/debian/certs',
 		refreshonly => true,