X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssl%2Ftemplates%2Fchained.erb;h=778a5b817aca237b75fbc1c0a2bbcba9ef32717d;hb=030ce8b3edff0fc9311d83cdfe9ba2735aee5221;hp=1ae6581d1f8155f1e1cbd18e1be647bbc1b5f7db;hpb=d49c5681d5da614ccc27ff96e91e9aa2bcee20c1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssl/templates/chained.erb b/modules/ssl/templates/chained.erb
index 1ae6581d1..778a5b817 100644
--- a/modules/ssl/templates/chained.erb
+++ b/modules/ssl/templates/chained.erb
@@ -1,7 +1,14 @@
 <%=
-    File.read("/etc/puppet/modules/ssl/files/servicecerts/#{name}.crt")
-%>
-<%=
-    fn = "/etc/puppet/modules/ssl/files/chains/#{name}.crt"
-    File.exist?(fn) ? File.read(fn) : ''
+  out = ""
+  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) ? ("\n" + File.read(chain)) : ''
+  else
+    fn = "/etc/puppet/modules/ssl/files/from-letsencrypt/#{name}.crt-chained"
+    out = File.read(fn)
+  end
+  out
 %>