diff options
| author | varac <varacanero@zeromail.org> | 2013-09-24 22:51:04 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-09-24 22:51:04 +0200 |
| commit | c171b05d95aa814872b216b1c119db7eeb805809 (patch) | |
| tree | 7a5419163127f98f4108415453f21af617bad222 /puppet/modules/site_webapp/templates/config.yml.erb | |
| parent | 372c2f96997f90ae9bfd6c3315e7244ce851c460 (diff) | |
| parent | 2aa2ab27860166b2846abbfd4ed2afc76576f714 (diff) | |
Merge branch 'feature/3917_openvpn_is_failing_to_connect' 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 0ce623fc..6b45abc2 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('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 + client_ca_key: <%= scope.lookupvar('x509::variables::keys') %>/<%= scope.lookupvar('site_config::params::client_ca_name') %>.key + client_ca_cert: <%= scope.lookupvar('x509::variables::local_CAs') %>/<%= scope.lookupvar('site_config::params::client_ca_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 %> |