X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssl%2Ftemplates%2Fchained.erb;h=737b9f5a90abafa0436644b615bf36974b2545a5;hb=bf2de708c73c0aee3af2585726515671284e0d9e;hp=99572b77546c0b93dbc7f709e4ce858dd77828c6;hpb=ddf5299204664fd8bbd5fdf47018221c8541c197;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssl/templates/chained.erb b/modules/ssl/templates/chained.erb
index 99572b775..737b9f5a9 100644
--- a/modules/ssl/templates/chained.erb
+++ b/modules/ssl/templates/chained.erb
@@ -1,13 +1,13 @@
 <%=
   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)
 
-    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
-    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