resolve exec dependency and rename

diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index 3696eb4561e93f64815d92856d8f19daef9c9d28..30cc261c0200de5681f72c509f2829438540596c 100644 (file)
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -46,7 +46,7 @@ class ssl {
        }
        file { '/etc/ssl/debian/certs/thishost.crt':
                source  => "puppet:///modules/ssl/clientcerts/${::fqdn}.client.crt",
-               notify  => Exec['c_rehash /etc/ssl/debian/certs'],
+               notify  => Exec['refresh_debian_hashes'],
        }
        file { '/etc/ssl/debian/keys/thishost.key':
                source  => "puppet:///modules/ssl/clientcerts/${::fqdn}.key",
@@ -56,14 +56,14 @@ class ssl {
        }
        file { '/etc/ssl/debian/certs/ca.crt':
                source  => 'puppet:///modules/ssl/clientcerts/ca.crt',
-               notify  => Exec['c_rehash /etc/ssl/debian/certs'],
+               notify  => Exec['refresh_debian_hashes'],
        }
        file { '/etc/ssl/debian/crls/ca.crl':
                source  => 'puppet:///modules/ssl/clientcerts/ca.crl',
        }
        file { '/etc/ssl/debian/certs/thishost-server.crt':
                source  => "puppet:///modules/exim/certs/${::fqdn}.crt",
-               notify  => Exec['c_rehash /etc/ssl/debian/certs'],
+               notify  => Exec['refresh_debian_hashes'],
        }
        file { '/etc/ssl/debian/keys/thishost-server.key':
                source  => "puppet:///modules/exim/certs/${::fqdn}.key",
@@ -90,7 +90,7 @@ class ssl {
                notify      => Exec['refresh_normal_hashes'],
                require     => Package['ca-certificates'],
        }
-       exec { 'c_rehash /etc/ssl/debian/certs': # refresh_debian_hashes
+       exec { 'refresh_debian_hashes':
                refreshonly => true,
                require     => Package['openssl'],
        }

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