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 /provider_base/provider.json | |
| parent | 5df867fbd3a78ca4160eb54d708d55a7d047bdb2 (diff) | |
| parent | 50d1839a5776dbb1c672e0c6083f709da67dc3b3 (diff) | |
Merge remote-tracking branch 'elijah/feature/expire' into develop
Conflicts:
platform.rb
Change-Id: Ifb1a7579e00b1ee2bdebe86671d5c2f1cac2a8dc
Diffstat (limited to 'provider_base/provider.json')
| -rw-r--r-- | provider_base/provider.json | 6 |
1 files changed, 3 insertions, 3 deletions
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" } |