From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 3 Oct 2017 08:31:19 +0000 (+0200)
Subject: move exim/certs to ssl/auto-certs
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e33609ec26fd4a964e150da0a3e4b3ec47ca1f31;p=mirror%2Fdsa-puppet.git

move exim/certs to ssl/auto-certs
---

diff --git a/modules/exim/files/certs b/modules/exim/files/certs
deleted file mode 120000
index 226fb7e72..000000000
--- a/modules/exim/files/certs
+++ /dev/null
@@ -1 +0,0 @@
-/srv/puppet.debian.org/ca/RESULT/certs
\ No newline at end of file
diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 8b4702413..bb8ad9323 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -109,22 +109,22 @@ class exim {
 		source => 'puppet:///modules/exim/common/logrotate-exim4-paniclog'
 	}
 	file { '/etc/exim4/ssl/thishost.crt':
-		source  => "puppet:///modules/exim/certs/${::fqdn}.crt",
+		source  => "puppet:///modules/ssl/auto-certs/${::fqdn}.crt",
 		group   => 'Debian-exim',
 		mode    => '0640',
 	}
 	file { '/etc/exim4/ssl/thishost.key':
-		source  => "puppet:///modules/exim/certs/${::fqdn}.key",
+		source  => "puppet:///modules/ssl/auto-certs/${::fqdn}.key",
 		group   => 'Debian-exim',
 		mode    => '0640',
 	}
 	file { '/etc/exim4/ssl/ca.crt':
-		source  => 'puppet:///modules/exim/certs/ca.crt',
+		source  => 'puppet:///modules/ssl/auto-certs/ca.crt',
 		group   => 'Debian-exim',
 		mode    => '0640',
 	}
 	file { '/etc/exim4/ssl/ca.crl':
-		source  => 'puppet:///modules/exim/certs/ca.crl',
+		source  => 'puppet:///modules/ssl/auto-certs/ca.crl',
 		group   => 'Debian-exim',
 		mode    => '0640',
 	}
diff --git a/modules/ssl/files/auto-certs b/modules/ssl/files/auto-certs
new file mode 120000
index 000000000..226fb7e72
--- /dev/null
+++ b/modules/ssl/files/auto-certs
@@ -0,0 +1 @@
+/srv/puppet.debian.org/ca/RESULT/certs
\ No newline at end of file
diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index 6aa194894..612fcc926 100644
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -112,7 +112,7 @@ class ssl {
 		source  => 'puppet:///modules/ssl/clientcerts/ca.crl',
 	}
 	file { '/etc/ssl/debian/certs/thishost-server.crt':
-		source  => "puppet:///modules/exim/certs/${::fqdn}.crt",
+		source  => "puppet:///modules/ssl/auto-certs/${::fqdn}.crt",
 		notify  => Exec['refresh_debian_hashes'],
 	}
 
@@ -133,7 +133,7 @@ class ssl {
 		require => Package['ssl-cert'],
 	}
 	file { '/etc/ssl/private/thishost-server.key':
-		source  => "puppet:///modules/exim/certs/${::fqdn}.key",
+		source  => "puppet:///modules/ssl/auto-certs/${::fqdn}.key",
 		mode    => '0440',
 		group   => ssl-cert,
 		require => Package['ssl-cert'],