projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for @syslogversion 3.8 from stretch
[mirror/dsa-puppet.git]
/
modules
/
ssl
/
templates
/
chained.erb
diff --git
a/modules/ssl/templates/chained.erb
b/modules/ssl/templates/chained.erb
index
99572b7
..
737b9f5
100644
(file)
--- a/
modules/ssl/templates/chained.erb
+++ b/
modules/ssl/templates/chained.erb
@@
-1,13
+1,13
@@
<%=
out = ""
<%=
out = ""
- fn = "/etc/puppet/modules/ssl/files/servicecerts/#{name}.crt"
+ fn = "/etc/puppet/modules/ssl/files/servicecerts/#{
@
name}.crt"
if File.exist?(fn) then
out = File.read(fn)
if File.exist?(fn) then
out = File.read(fn)
- chain = "/etc/puppet/modules/ssl/files/chains/#{name}.crt"
- out += File.exist?(chain) ?
File.read(chain
) : ''
+ chain = "/etc/puppet/modules/ssl/files/chains/#{
@
name}.crt"
+ out += File.exist?(chain) ?
("\n" + File.read(chain)
) : ''
else
else
- fn = "/etc/puppet/modules/ssl/files/from-letsencrypt/#{name}.crt-chained"
+ fn = "/etc/puppet/modules/ssl/files/from-letsencrypt/#{
@
name}.crt-chained"
out = File.read(fn)
end
out
out = File.read(fn)
end
out