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

Append chain if exists
---

diff --git a/modules/ssl/templates/chained.erb b/modules/ssl/templates/chained.erb
index 99572b775..778a5b817 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"
-    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)