From 32af51c0ce0cccd69e4194ca25d17cb562640f55 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 3 Oct 2017 10:33:04 +0200 Subject: [PATCH] move ssl/clientcerts to ssl/auto-clientcerts --- modules/ssl/files/{clientcerts => auto-clientcerts} | 0 modules/ssl/manifests/init.pp | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) rename modules/ssl/files/{clientcerts => auto-clientcerts} (100%) diff --git a/modules/ssl/files/clientcerts b/modules/ssl/files/auto-clientcerts similarity index 100% rename from modules/ssl/files/clientcerts rename to modules/ssl/files/auto-clientcerts 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'], -- 2.20.1