From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 3 Oct 2017 08:34:37 +0000 (+0200)
Subject: And more move things
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=dd6385d0133716bda9e049597e71c5f3d9acaa8d;p=mirror%2Fdsa-puppet.git

And more move things
---

diff --git a/modules/debian_org/manifests/mail_incoming_port.pp b/modules/debian_org/manifests/mail_incoming_port.pp
index cbe9cb613..ace2e352f 100644
--- a/modules/debian_org/manifests/mail_incoming_port.pp
+++ b/modules/debian_org/manifests/mail_incoming_port.pp
@@ -17,7 +17,7 @@ class debian_org::mail_incoming_port {
 	}
 	dnsextras::tlsa_record{ 'tlsa-mailport':
 		zone     => 'debian.org',
-		certfile => "/etc/puppet/modules/exim/files/certs/${::fqdn}.crt",
+		certfile => "/etc/puppet/modules/ssl/files/auto-certs/${::fqdn}.crt",
 		port     => $mail_port,
 		hostname => $::fqdn,
 	}
diff --git a/modules/exim/manifests/mx.pp b/modules/exim/manifests/mx.pp
index 54f1933b3..9b5bf4bd5 100644
--- a/modules/exim/manifests/mx.pp
+++ b/modules/exim/manifests/mx.pp
@@ -25,7 +25,7 @@ class exim::mx inherits exim {
 	}
 	dnsextras::tlsa_record{ "tlsa-submission":
 		zone => 'debian.org',
-		certfile => "/etc/puppet/modules/exim/files/certs/${::fqdn}.crt",
+		certfile => "/etc/puppet/modules/ssl/files/auto-certs/${::fqdn}.crt",
 		port => 587,
 		hostname => "$::fqdn",
 	}
diff --git a/modules/stunnel4/manifests/client.pp b/modules/stunnel4/manifests/client.pp
index eb7dac7b2..b13e3d49c 100644
--- a/modules/stunnel4/manifests/client.pp
+++ b/modules/stunnel4/manifests/client.pp
@@ -3,8 +3,8 @@ define stunnel4::client($accept, $connecthost, $connectport) {
 	include stunnel4
 
 	file { "/etc/stunnel/puppet-${name}-peer.pem":
-		content => generate('/bin/cat', "/etc/puppet/modules/exim/files/certs/${connecthost}.crt",
-			'/etc/puppet/modules/exim/files/certs/ca.crt'),
+		content => generate('/bin/cat', "/etc/puppet/modules/ssl/files/auto-certs/${connecthost}.crt",
+			'/etc/puppet/modules/ssl/files/auto-certs/ca.crt'),
 		notify  => Exec["restart_stunnel_${name}"],
 	}