projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ddf5299
)
Append chain if exists
author
Peter Palfrader
<peter@palfrader.org>
Sun, 31 Jan 2016 17:02:36 +0000
(17:02 +0000)
committer
Peter Palfrader
<peter@palfrader.org>
Sun, 31 Jan 2016 17:02:36 +0000
(17:02 +0000)
modules/ssl/templates/chained.erb
patch
|
blob
|
history
diff --git
a/modules/ssl/templates/chained.erb
b/modules/ssl/templates/chained.erb
index
99572b7
..
778a5b8
100644
(file)
--- a/
modules/ssl/templates/chained.erb
+++ b/
modules/ssl/templates/chained.erb
@@
-5,7
+5,7
@@
out = File.read(fn)
chain = "/etc/puppet/modules/ssl/files/chains/#{name}.crt"
- out += File.exist?(chain) ?
File.read(chain
) : ''
+ out += File.exist?(chain) ?
("\n" + File.read(chain)
) : ''
else
fn = "/etc/puppet/modules/ssl/files/from-letsencrypt/#{name}.crt-chained"
out = File.read(fn)