projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix whitelist macro
[mirror/dsa-puppet.git]
/
modules
/
ssl
/
manifests
/
init.pp
diff --git
a/modules/ssl/manifests/init.pp
b/modules/ssl/manifests/init.pp
index
20a0030
..
391da0a
100644
(file)
--- a/
modules/ssl/manifests/init.pp
+++ b/
modules/ssl/manifests/init.pp
@@
-5,7
+5,7
@@
class ssl {
"/etc/ssl/debian":
ensure => directory,
mode => 755,
"/etc/ssl/debian":
ensure => directory,
mode => 755,
- purge => true
+ purge => true
,
recurse => true,
force => true,
source => "puppet:///files/empty/"
recurse => true,
force => true,
source => "puppet:///files/empty/"
@@
-13,9
+13,6
@@
class ssl {
"/etc/ssl/debian/certs":
ensure => directory,
mode => 755,
"/etc/ssl/debian/certs":
ensure => directory,
mode => 755,
- purge => true,
- force => true,
- recurse => true,
source => "puppet:///files/empty/"
;
"/etc/ssl/debian/crls":
source => "puppet:///files/empty/"
;
"/etc/ssl/debian/crls":
@@
-29,25
+26,25
@@
class ssl {
"/etc/ssl/debian/keys":
ensure => directory,
mode => 750,
"/etc/ssl/debian/keys":
ensure => directory,
mode => 750,
- purge => true
+ purge => true
,
force => true,
recurse => true,
source => "puppet:///files/empty/"
;
"/etc/ssl/debian/certs/thishost.crt":
force => true,
recurse => true,
source => "puppet:///files/empty/"
;
"/etc/ssl/debian/certs/thishost.crt":
- source => "puppet:///
ssl/clientcerts/$fqdn
.crt",
+ source => "puppet:///
modules/ssl/clientcerts/$fqdn.client
.crt",
notify => Exec["c_rehash /etc/ssl/debian/certs"],
;
"/etc/ssl/debian/keys/thishost.key":
notify => Exec["c_rehash /etc/ssl/debian/certs"],
;
"/etc/ssl/debian/keys/thishost.key":
- source => "puppet:///ssl/clientcerts/$fqdn.key",
+ source => "puppet:///
modules/
ssl/clientcerts/$fqdn.key",
mode => 640
;
"/etc/ssl/debian/certs/ca.crt":
mode => 640
;
"/etc/ssl/debian/certs/ca.crt":
- source => "puppet:///
exim/
certs/ca.crt",
+ source => "puppet:///
modules/ssl/client
certs/ca.crt",
notify => Exec["c_rehash /etc/ssl/debian/certs"],
;
"/etc/ssl/debian/crls/ca.crl":
notify => Exec["c_rehash /etc/ssl/debian/certs"],
;
"/etc/ssl/debian/crls/ca.crl":
- source => "puppet:///
exim/
certs/ca.crl",
+ source => "puppet:///
modules/ssl/client
certs/ca.crl",
;
}
;
}