projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ferm: open ssh from mirror-master to ports mirror
[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
a3f9445
..
52cd039
100644
(file)
--- a/
modules/ssl/templates/key-chained.erb
+++ b/
modules/ssl/templates/key-chained.erb
@@
-1,10
+1,12
@@
<%=
<%=
- fn = "/srv/puppet.debian.org/from-letsencrypt/#{@name}.key"
+ dir = scope().call_function('hiera', ['paths.letsencrypt_dir'])
+
+ fn = "#{dir}/#{@name}.key"
out = File.read(fn)
out
%>
<%=
out = File.read(fn)
out
%>
<%=
- fn = "
/srv/puppet.debian.org/from-letsencrypt
/#{@name}.crt-chained"
+ fn = "
#{dir}
/#{@name}.crt-chained"
out = File.read(fn)
out
%>
out = File.read(fn)
out
%>