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