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/site_webapp/templates/config.yml.erb | |
| parent | e182d12c72743491805a3873e8b6cd804fe5394c (diff) | |
| parent | 486a9cd3b7bd8d643a9623fd40db2286cdf52fc8 (diff) | |
Merge branch 'feature/3832_Unify_x509_certs__keys_and_ca' into develop
Diffstat (limited to 'puppet/modules/site_webapp/templates/config.yml.erb')
| -rw-r--r-- | puppet/modules/site_webapp/templates/config.yml.erb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/puppet/modules/site_webapp/templates/config.yml.erb b/puppet/modules/site_webapp/templates/config.yml.erb index 05d62d41..0ce623fc 100644 --- a/puppet/modules/site_webapp/templates/config.yml.erb +++ b/puppet/modules/site_webapp/templates/config.yml.erb @@ -3,8 +3,8 @@ production: admins: <%= @webapp['admins'].inspect %> domain: <%= @provider_domain %> force_ssl: <%= @webapp['secure'] %> - client_ca_key: <%= scope.lookupvar('site_webapp::client_ca::key_path') %> - client_ca_cert: <%= scope.lookupvar('site_webapp::client_ca::cert_path') %> + client_ca_key: <%= scope.lookupvar('x509::variables::keys') %>/<%= scope.lookupvar('site_config::params::cert_name') %>.key + client_ca_cert: <%= scope.lookupvar('x509::variables::certs') %>/<%= scope.lookupvar('site_config::params::cert_name') %>.crt secret_token: "<%= @secret_token %>" client_cert_lifespan: <%= cert_options['life_span'].to_i %> client_cert_bit_size: <%= cert_options['bit_size'].to_i %> |