diff options
| author | varac <varacanero@zeromail.org> | 2013-09-20 18:58:29 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-09-20 18:58:29 +0200 |
| commit | 0bf2c2eeaf5f8b683454ce0d0dbe88bb6f17c08f (patch) | |
| tree | a5252934c67cb2316e8d7163c5170f58e3f51491 /puppet/modules/soledad/templates | |
| parent | e182d12c72743491805a3873e8b6cd804fe5394c (diff) | |
| parent | 486a9cd3b7bd8d643a9623fd40db2286cdf52fc8 (diff) | |
Merge branch 'feature/3832_Unify_x509_certs__keys_and_ca' into develop
Diffstat (limited to 'puppet/modules/soledad/templates')
| -rw-r--r-- | puppet/modules/soledad/templates/default-soledad.erb | 4 |
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%> |