X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssl%2Fmanifests%2Finit.pp;fp=modules%2Fssl%2Fmanifests%2Finit.pp;h=ee8306772cd8ec40a930637017bb28dacaeaaa40;hb=76ca91bce24ecbcbcc4e62a37aa06fd0fb9f96c7;hp=a63f8f7c07731d842e031f011475ac2bd252e817;hpb=46cee04ab06b23ab6e9e4baba655cf470d10cfc4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index a63f8f7c0..ee8306772 100644
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -1,6 +1,4 @@
 class ssl {
-	$caconf = '/etc/ca-certificates.conf'
-
 	package { 'openssl':
 		ensure   => installed,
 	}
@@ -29,7 +27,7 @@ class ssl {
 	}
 	file { '/etc/ca-certificates-debian.conf':
 		mode    => '0444',
-		source => 'puppet:///modules/ssl/ca-certificates-debian.conf',
+		source => 'puppet:///modules/ssl/ca-certificates.conf',
 		notify  => Exec['refresh_ca_debian_hashes'],
 	}
 	file { '/etc/ca-certificates-global.conf':
@@ -37,11 +35,6 @@ class ssl {
 		notify  => Exec['refresh_ca_global_hashes'],
 	}
 
-	file { '/etc/apt/apt.conf.d/local-ssl-ca-global':
-		mode   => '0444',
-		source => 'puppet:///modules/ssl/local-ssl-ca-global',
-	}
-
 	file { '/etc/ssl/certs/ssl-cert-snakeoil.pem':
 		ensure => absent,
 		notify => Exec['refresh_normal_hashes'],
@@ -51,17 +44,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 +140,12 @@ 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'],
+	file { '/etc/apt/apt.conf.d/local-ssl-ca-global':
+		mode   => '0444',
+		content => template('ssl/local-ssl-ca-global.erb'),
 	}
+
+
 	exec { 'refresh_debian_hashes':
 		command     => 'c_rehash /etc/ssl/debian/certs',
 		refreshonly => true,