From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 3 Sep 2013 20:32:52 +0000 (+0200)
Subject: de-conflict tlsa record names for puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=bc7f68b0fdd0cf4cb133f32d1fc15e9eaa252ac3;p=mirror%2Fdsa-puppet.git

de-conflict tlsa record names for puppet
---

diff --git a/modules/ssl/manifests/service.pp b/modules/ssl/manifests/service.pp
index 7b8921cea..ef7d74a13 100644
--- a/modules/ssl/manifests/service.pp
+++ b/modules/ssl/manifests/service.pp
@@ -16,7 +16,7 @@ define ssl::service($ensure = present, $tlsaport = 443, $notify = []) {
 	}
 
 	if $tlsaport > 0 {
-		dnsextras::tlsa_record{ "tlsa-${tlsaport}":
+		dnsextras::tlsa_record{ "tlsa-${name}-${tlsaport}":
 			zone => 'debian.org',
 			certfile => "/etc/puppet/modules/ssl/files/servicecerts/${name}.crt",
 			port => $tlsaport,