projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
wiki -> hiera role; explicitly include apache2
[mirror/dsa-puppet.git]
/
modules
/
ssl
/
templates
/
key.erb
diff --git
a/modules/ssl/templates/key.erb
b/modules/ssl/templates/key.erb
index
29f969b
..
d3148b8
100644
(file)
--- a/
modules/ssl/templates/key.erb
+++ b/
modules/ssl/templates/key.erb
@@
-1,5
+1,6
@@
<%=
- fn = "/srv/puppet.torproject.org/from-letsencrypt/#{@name}.key"
+ dir = scope().call_function('hiera', ['paths.letsencrypt_dir'])
+ fn = "#{dir}/#{@name}.key"
out = File.read(fn)
out
%>