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

move ssl/clientcerts to ssl/auto-clientcerts
---

diff --git a/modules/ssl/files/auto-clientcerts b/modules/ssl/files/auto-clientcerts
new file mode 120000
index 000000000..bba61ca3c
--- /dev/null
+++ b/modules/ssl/files/auto-clientcerts
@@ -0,0 +1 @@
+/srv/puppet.debian.org/ca/RESULT/clientcerts
\ No newline at end of file
diff --git a/modules/ssl/files/clientcerts b/modules/ssl/files/clientcerts
deleted file mode 120000
index bba61ca3c..000000000
--- a/modules/ssl/files/clientcerts
+++ /dev/null
@@ -1 +0,0 @@
-/srv/puppet.debian.org/ca/RESULT/clientcerts
\ No newline at end of file
diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index 612fcc926..9d9581b2b 100644
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -101,15 +101,15 @@ class ssl {
 		mode    => '0755',
 	}
 	file { '/etc/ssl/debian/certs/thishost.crt':
-		source  => "puppet:///modules/ssl/clientcerts/${::fqdn}.client.crt",
+		source  => "puppet:///modules/ssl/auto-clientcerts/${::fqdn}.client.crt",
 		notify  => Exec['refresh_debian_hashes'],
 	}
 	file { '/etc/ssl/debian/certs/ca.crt':
-		source  => 'puppet:///modules/ssl/clientcerts/ca.crt',
+		source  => 'puppet:///modules/ssl/auto-clientcerts/ca.crt',
 		notify  => Exec['refresh_debian_hashes'],
 	}
 	file { '/etc/ssl/debian/crls/ca.crl':
-		source  => 'puppet:///modules/ssl/clientcerts/ca.crl',
+		source  => 'puppet:///modules/ssl/auto-clientcerts/ca.crl',
 	}
 	file { '/etc/ssl/debian/certs/thishost-server.crt':
 		source  => "puppet:///modules/ssl/auto-certs/${::fqdn}.crt",
@@ -127,7 +127,7 @@ class ssl {
 		force    => true,
 	}
 	file { '/etc/ssl/private/thishost.key':
-		source  => "puppet:///modules/ssl/clientcerts/${::fqdn}.key",
+		source  => "puppet:///modules/ssl/auto-clientcerts/${::fqdn}.key",
 		mode    => '0440',
 		group   => ssl-cert,
 		require => Package['ssl-cert'],