diff options
| author | varac <varacanero@zeromail.org> | 2013-09-19 16:49:53 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-09-19 18:19:50 +0200 |
| commit | 0397643c8c10de21fb67e0de9cd86c323bbbc3da (patch) | |
| tree | c0e61f0b53842e1b0b98b0a9bb2359a58f78d9d7 /puppet/modules | |
| parent | 77a2c7864953886e8861217bb4947bae6366acc8 (diff) | |
fix x509 path in webapp config.yml.erb (#3894)
Diffstat (limited to 'puppet/modules')
| -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..57e4ccb6 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 %> |