decommission petrova (RT#7978)

[mirror/dsa-puppet.git] / modules / ssl / templates / key-chained.erb

diff --git a/modules/ssl/templates/key-chained.erb b/modules/ssl/templates/key-chained.erb
index 2fbace0..52cd039 100644 (file)
--- 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
 %>