diff options
| author | Micah Anderson <micah@leap.se> | 2015-02-03 10:49:40 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2015-02-03 10:49:40 -0500 |
| commit | 85e539db630b9b7a775bd5e17a81d0764a502908 (patch) | |
| tree | 0464267fed4ee75e2a368270dc63c3be7435d9a9 /puppet | |
| parent | 5df867fbd3a78ca4160eb54d708d55a7d047bdb2 (diff) | |
| parent | 50d1839a5776dbb1c672e0c6083f709da67dc3b3 (diff) | |
Merge remote-tracking branch 'elijah/feature/expire' into develop
Conflicts:
platform.rb
Change-Id: Ifb1a7579e00b1ee2bdebe86671d5c2f1cac2a8dc
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/modules/site_webapp/templates/config.yml.erb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/modules/site_webapp/templates/config.yml.erb b/puppet/modules/site_webapp/templates/config.yml.erb index c6895256..ccde2d2e 100644 --- a/puppet/modules/site_webapp/templates/config.yml.erb +++ b/puppet/modules/site_webapp/templates/config.yml.erb @@ -7,7 +7,7 @@ production: 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_lifespan: <%= cert_options['life_span'] %> client_cert_bit_size: <%= cert_options['bit_size'].to_i %> client_cert_hash: <%= cert_options['digest'] %> allow_limited_certs: <%= @webapp['allow_limited_certs'].inspect %> |