manage /etc/ca-certificates.conf because gandi

[mirror/dsa-puppet.git] / modules / ssl / manifests / service.pp

diff --git a/modules/ssl/manifests/service.pp b/modules/ssl/manifests/service.pp
index 0694d09..ef7d74a 100644 (file)
--- a/modules/ssl/manifests/service.pp
+++ b/modules/ssl/manifests/service.pp
@@ -10,12 +10,13 @@ define ssl::service($ensure = present, $tlsaport = 443, $notify = []) {
                notify => [ Exec['c_rehash /etc/ssl/debian/certs'], $notify ],
        }
        file { "/etc/ssl/debian/certs/$name.crt-chain":
-               source => [ "puppet:///modules/ssl/servicecerts/${name}.crt-chain",  "puppet:///modules/ssl/empty" ]
+               source => [ "puppet:///modules/ssl/chains/${name}.crt", "puppet:///modules/ssl/servicecerts/${name}.crt" ],
                notify => [ Exec['c_rehash /etc/ssl/debian/certs'], $notify ],
+               links => follow,
        }
 
        if $tlsaport > 0 {
-               dnsextras::tlsa_record{ "tlsa-${tlsaport}":
+               dnsextras::tlsa_record{ "tlsa-${name}-${tlsaport}":
                        zone => 'debian.org',
                        certfile => "/etc/puppet/modules/ssl/files/servicecerts/${name}.crt",
                        port => $tlsaport,