X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fssl%2Fmanifests%2Fservice.pp;h=fbca2fae2c86b2328de922e1a3120d01996e7469;hb=fe3ba85c819555730166a7c70a3ae2181998d060;hp=7b8921ceae49966ce94f929a0740c7f6b3c22927;hpb=856320396d2488b41a6db2edd34876e14a9e4564;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssl/manifests/service.pp b/modules/ssl/manifests/service.pp
index 7b8921cea..fbca2fae2 100644
--- a/modules/ssl/manifests/service.pp
+++ b/modules/ssl/manifests/service.pp
@@ -6,20 +6,24 @@ define ssl::service($ensure = present, $tlsaport = 443, $notify = []) {
 	}
 
 	file { "/etc/ssl/debian/certs/$name.crt":
-		source => "puppet:///modules/ssl/servicecerts/${name}.crt",
-		notify => [ Exec['c_rehash /etc/ssl/debian/certs'], $notify ],
+		source => [ "puppet:///modules/ssl/servicecerts/${name}.crt", "puppet:///modules/ssl/from-letsencrypt/${name}.crt" ],
+		notify => [ Exec['refresh_debian_hashes'], $notify ],
 	}
 	file { "/etc/ssl/debian/certs/$name.crt-chain":
-		source => [ "puppet:///modules/ssl/chains/${name}.crt", "puppet:///modules/ssl/servicecerts/${name}.crt" ],
-		notify => [ Exec['c_rehash /etc/ssl/debian/certs'], $notify ],
-		links => follow,
+		source => [ "puppet:///modules/ssl/chains/${name}.crt", "puppet:///modules/ssl/servicecerts/${name}.crt", "puppet:///modules/ssl/from-letsencrypt/${name}.crt-chain" ],
+		notify => [ $notify ],
+		links  => follow,
+	}
+	file { "/etc/ssl/debian/certs/$name.crt-chained":
+		content => template('ssl/chained.erb'),
+		notify => [ $notify ],
 	}
 
 	if $tlsaport > 0 {
-		dnsextras::tlsa_record{ "tlsa-${tlsaport}":
-			zone => 'debian.org',
-			certfile => "/etc/puppet/modules/ssl/files/servicecerts/${name}.crt",
-			port => $tlsaport,
+		dnsextras::tlsa_record{ "tlsa-${name}-${tlsaport}":
+			zone     => 'debian.org',
+			certfile => [ "puppet:///modules/ssl/servicecerts/${name}.crt", "puppet:///modules/ssl/from-letsencrypt/${name}.crt" ],
+			port     => $tlsaport,
 			hostname => "$name",
 		}
 	}