From: Tollef Fog Heen <tfheen@err.no>
Date: Tue, 10 Jan 2017 20:16:00 +0000 (+0100)
Subject: .. and add the template
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e19d06b00d9fecd4c1263bd487486ade0b6b6d90;p=mirror%2Fdsa-puppet.git

.. and add the template
---

diff --git a/modules/ssl/templates/key-chained.erb b/modules/ssl/templates/key-chained.erb
new file mode 100644
index 000000000..2fbace05a
--- /dev/null
+++ b/modules/ssl/templates/key-chained.erb
@@ -0,0 +1,25 @@
+<%=
+  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
+  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
+  out
+%>