summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2015-02-03 10:49:40 -0500
committerMicah Anderson <micah@leap.se>2015-02-03 10:49:40 -0500
commit85e539db630b9b7a775bd5e17a81d0764a502908 (patch)
tree0464267fed4ee75e2a368270dc63c3be7435d9a9
parent5df867fbd3a78ca4160eb54d708d55a7d047bdb2 (diff)
parent50d1839a5776dbb1c672e0c6083f709da67dc3b3 (diff)
Merge remote-tracking branch 'elijah/feature/expire' into develop
Conflicts: platform.rb Change-Id: Ifb1a7579e00b1ee2bdebe86671d5c2f1cac2a8dc
-rw-r--r--platform.rb2
-rw-r--r--provider_base/provider.json6
-rw-r--r--puppet/modules/site_webapp/templates/config.yml.erb2
3 files changed, 5 insertions, 5 deletions
diff --git a/platform.rb b/platform.rb
index 7dadbc7b..1466b33c 100644
--- a/platform.rb
+++ b/platform.rb
@@ -5,7 +5,7 @@
Leap::Platform.define do
self.version = "0.6.1"
- self.compatible_cli = "1.6.1".."1.99"
+ self.compatible_cli = "1.6.3".."1.99"
#
# the facter facts that should be gathered
diff --git a/provider_base/provider.json b/provider_base/provider.json
index 84d033c5..a60411b1 100644
--- a/provider_base/provider.json
+++ b/provider_base/provider.json
@@ -42,16 +42,16 @@
"organizational_unit": "= 'https://' + provider.domain",
"bit_size": 4096,
"digest": "SHA256",
- "life_span": "10y",
+ "life_span": "10 years",
"server_certificates": {
"bit_size": 4096,
"digest": "SHA256",
- "life_span": "1y"
+ "life_span": "1 years"
},
"client_certificates": {
"bit_size": 2048,
"digest": "SHA256",
- "life_span": "2m",
+ "life_span": "2 months",
"limited_prefix": "LIMITED",
"unlimited_prefix": "UNLIMITED"
}
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 %>