X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssl%2Ftemplates%2Fkey-chained.erb;h=52cd0399a5367133edcd6fd891196d3b377a4205;hb=335562bbe2753e443a6f1dc3b67b4e422377d15d;hp=75b34283f1a17b109bb5d7d0f1afe24a586a23df;hpb=d8a52fe556442959340377f0849415412231c138;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssl/templates/key-chained.erb b/modules/ssl/templates/key-chained.erb
index 75b34283f..52cd0399a 100644
--- a/modules/ssl/templates/key-chained.erb
+++ b/modules/ssl/templates/key-chained.erb
@@ -1,25 +1,12 @@
 <%=
-  out = ""
-  fn = "/etc/puppet/modules/ssl/files/keys/#{@name}.crt"
-  if File.exist?(fn) then
-    out = File.read(fn)
-  else
-    fn = "/etc/puppet/modules/ssl/files/from-letsencrypt/#{@name}.key"
-    out = File.read(fn)
-  end
+  dir = scope().call_function('hiera', ['paths.letsencrypt_dir'])
+
+  fn = "#{dir}/#{@name}.key"
+  out = File.read(fn)
   out
 %>
 <%=
-  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
+  fn = "#{dir}/#{@name}.crt-chained"
+  out = File.read(fn)
   out
 %>