Merge branch 'rabbitmq' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

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

diff --git a/modules/ssl/manifests/service.pp b/modules/ssl/manifests/service.pp
index f040052..54a4110 100644 (file)
--- a/modules/ssl/manifests/service.pp
+++ b/modules/ssl/manifests/service.pp
@@ -11,9 +11,13 @@ define ssl::service($ensure = present, $tlsaport = 443, $notify = []) {
        }
        file { "/etc/ssl/debian/certs/$name.crt-chain":
                source => [ "puppet:///modules/ssl/chains/${name}.crt", "puppet:///modules/ssl/servicecerts/${name}.crt" ],
-               notify => [ Exec['refresh_debian_hashes'], $notify ],
+               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-${name}-${tlsaport}":