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 133c9b4ee136499490fc4c77484b93c3765db2b7..f0400525dd76313b9145e5911dacd9be03e0e67c 100644 (file)
--- a/modules/ssl/manifests/service.pp
+++ b/modules/ssl/manifests/service.pp
@@ -1,27 +1,25 @@
-define ssl::service($ensure = present, $tlsaport = 443) {
+define ssl::service($ensure = present, $tlsaport = 443, $notify = []) {
        $link_target = $ensure ? {
                present => link,
                absent  => absent,
                default => fail ( "Unknown ensure value: '$ensure'" ),
        }
 
-       file { "/etc/munin/plugins/${name}":
-               ensure  => $link_target,
-               target  => "/usr/share/munin/plugins/${link}",
-               require => Package['munin-node'],
-               notify  => Service['munin-node'],
-       }
-
        file { "/etc/ssl/debian/certs/$name.crt":
                source => "puppet:///modules/ssl/servicecerts/${name}.crt",
-               notify => Exec['c_rehash /etc/ssl/debian/certs'],
+               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",
                }
        }