summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-09-19 13:50:27 +0200
committervarac <varacanero@zeromail.org>2013-09-19 13:50:27 +0200
commit77a2c7864953886e8861217bb4947bae6366acc8 (patch)
tree876ff851a1f1661dcd92d2263fe7522eb530a011 /puppet/modules
parent55578fec453d6b090f623fd3368138f9e322c9f5 (diff)
tidy soledad x509 definitions (#3841)
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/soledad/templates/default-soledad.erb4
1 files changed, 2 insertions, 2 deletions
diff --git a/puppet/modules/soledad/templates/default-soledad.erb b/puppet/modules/soledad/templates/default-soledad.erb
index fd38903a..32504e38 100644
--- a/puppet/modules/soledad/templates/default-soledad.erb
+++ b/puppet/modules/soledad/templates/default-soledad.erb
@@ -1,5 +1,5 @@
# this file is managed by puppet
START=yes
-CERT_PATH=/etc/x509/certs/soledad.crt
-PRIVKEY_PATH=/etc/x509/keys/soledad.key
+CERT_PATH=<%= scope.lookupvar('x509::variables::certs') %>/<%= scope.lookupvar('site_config::params::cert_name') %>.crt
+PRIVKEY_PATH=<%= scope.lookupvar('x509::variables::keys') %>/<%= scope.lookupvar('site_config::params::cert_name') %>.key
HTTPS_PORT=<%=@soledad_port%>