X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fssl%2Ftemplates%2Fchained.erb;h=dc5fed0798ca41c86ef452c196d7949ef653087d;hb=fe3ba85c819555730166a7c70a3ae2181998d060;hp=1ae6581d1f8155f1e1cbd18e1be647bbc1b5f7db;hpb=16db43a619554725efd6f1472d81272824564638;p=mirror%2Fdsa-puppet.git

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