move ssl/clientcerts to ssl/auto-clientcerts
authorPeter Palfrader <peter@palfrader.org>
Tue, 3 Oct 2017 08:33:04 +0000 (10:33 +0200)
committerPeter Palfrader <peter@palfrader.org>
Tue, 3 Oct 2017 08:33:04 +0000 (10:33 +0200)
modules/ssl/files/auto-clientcerts [new symlink]
modules/ssl/files/clientcerts [deleted symlink]
modules/ssl/manifests/init.pp

diff --git a/modules/ssl/files/auto-clientcerts b/modules/ssl/files/auto-clientcerts
new file mode 120000 (symlink)
index 0000000..bba61ca
--- /dev/null
@@ -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 (symlink)
index bba61ca..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/srv/puppet.debian.org/ca/RESULT/clientcerts
\ No newline at end of file
index 612fcc9..9d9581b 100644 (file)
@@ -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'],