resolve exec dependency and rename

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

diff --git a/modules/ssl/manifests/service.pp b/modules/ssl/manifests/service.pp
index 9db3b2b2f60855ba105f2abb417d9c15b962f1f5..f0400525dd76313b9145e5911dacd9be03e0e67c 100644 (file)
--- a/modules/ssl/manifests/service.pp
+++ b/modules/ssl/manifests/service.pp
@@ -7,14 +7,19 @@ 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 ],
+               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['refresh_debian_hashes'], $notify ],
+               links  => follow,
        }
 
        if $tlsaport > 0 {
-               dnsextras::tlsa_record{ "tlsa-${tlsaport}":
-                       zone => 'debian.org',
+               dnsextras::tlsa_record{ "tlsa-${name}-${tlsaport}":
+                       zone     => 'debian.org',
                        certfile => "/etc/puppet/modules/ssl/files/servicecerts/${name}.crt",
-                       port => $tlsaport,
+                       port     => $tlsaport,
                        hostname => "$name",
                }
        }