From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 31 Jan 2016 17:01:53 +0000 (+0000)
Subject: Append chain if exists
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=ddf5299204664fd8bbd5fdf47018221c8541c197;p=mirror%2Fdsa-puppet.git

Append chain if exists
---

diff --git a/modules/ssl/templates/chained.erb b/modules/ssl/templates/chained.erb
index dc5fed079..99572b775 100644
--- 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"
-    File.exist?(chain) ? File.read(chain) : ''
+    out += File.exist?(chain) ? File.read(chain) : ''
   else
     fn = "/etc/puppet/modules/ssl/files/from-letsencrypt/#{name}.crt-chained"
     out = File.read(fn)