X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssl%2Fmanifests%2Finit.pp;h=0ae64aa4ed8f9638377fb5f390fac4a5f3c090cd;hb=47287f7421d22048db82e34af609b927918a70eb;hp=127869a0a7ce0bd1e94166bd36606994b9715561;hpb=5ea69733aab993c0fe3f2cf731f2d7a3c0328939;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index 127869a0a..0ae64aa4e 100644
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -12,16 +12,16 @@ class ssl {
 	}
 
 	file { '/etc/ca-certificates.conf':
-		content => "# This file is under puppet control\n# Only debian.org service certs are trusted, see /etc/ssl/certs/README",
+		content => "# This file is under puppet control\n# Only debian.org service certs are trusted, see /etc/ssl/certs/README\n",
 		notify  => Exec['refresh_normal_hashes'],
 	}
 	file { '/etc/ca-certificates-debian.conf':
 		mode    => '0444',
-		content => "# This file is under puppet control\n# Only the CAs for debian.org are trusted, see /etc/ssl/ca-debian/README\nmozilla/AddTrust_External_Root.crt",
+		content => "# This file is under puppet control\n# Only the CAs for debian.org are trusted, see /etc/ssl/ca-debian/README\nmozilla/AddTrust_External_Root.crt\nmozilla/UTN_USERFirst_Hardware_Root_CA.crt\nspi-inc.org/spi-cacert-2008.crt\n",
 		notify  => Exec['refresh_ca_debian_hashes'],
 	}
 	file { '/etc/ca-certificates-global.conf':
-		content => "# This file is under puppet control\n# All CAs are trusted, see /etc/ssl/ca-global/README",
+		content => "# This file is under puppet control\n# All CAs are trusted, see /etc/ssl/ca-global/README\n",
 		notify  => Exec['refresh_ca_global_hashes'],
 	}
 
@@ -71,7 +71,7 @@ class ssl {
 		ensure => directory,
 		mode   => '0755',
 	}
-	file { '/etc/ssl/ca-debian/README':
+	file { '/etc/ssl/ca-global/README':
 		mode   => '0444',
 		source => 'puppet:///modules/ssl/README.ca-global',
 	}