X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssl%2Fmanifests%2Finit.pp;h=ee8306772cd8ec40a930637017bb28dacaeaaa40;hb=90ed72586f37f196710c93390d6a6caac0033223;hp=21e51e614d5fa4cab1f2d61464c6288673f72de5;hpb=cf682174f1c74d95185684d3b335c83f2cd31e68;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index 21e51e614..ee8306772 100644
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -35,11 +35,6 @@ class ssl {
 		notify  => Exec['refresh_ca_global_hashes'],
 	}
 
-	file { '/etc/apt/apt.conf.d/local-ssl-ca-global':
-		mode   => '0444',
-		content => template('ssl/local-ssl-ca-global.erb'),
-	}
-
 	file { '/etc/ssl/certs/ssl-cert-snakeoil.pem':
 		ensure => absent,
 		notify => Exec['refresh_normal_hashes'],
@@ -145,6 +140,12 @@ class ssl {
 		$updatecacerts = $updatecacertsdsa
 	}
 
+	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,