From: Luca Filipozzi <lfilipoz@emyr.net>
Date: Sat, 4 Jan 2014 03:26:01 +0000 (+0000)
Subject: resolve exec dependency and rename
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=745714ee9bbb6fcbabbf46820358c1c4b7ee005d

resolve exec dependency and rename
---

diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index 3696eb45..30cc261c 100644
--- 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 ef7d74a1..f0400525 100644
--- 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",
 		}
 	}