From 50d1839a5776dbb1c672e0c6083f709da67dc3b3 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 28 Jan 2015 22:22:31 -0800
Subject: update default provider.json to use the (now) correct expiration time
 format. requires new leap_cli.

---
 platform.rb                                         | 4 ++--
 provider_base/provider.json                         | 6 +++---
 puppet/modules/site_webapp/templates/config.yml.erb | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/platform.rb b/platform.rb
index 26b17465..1466b33c 100644
--- a/platform.rb
+++ b/platform.rb
@@ -4,8 +4,8 @@
 #
 
 Leap::Platform.define do
-  self.version = "0.6"
-  self.compatible_cli = "1.6.1".."1.99"
+  self.version = "0.6.1"
+  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 0c75f3ca..5c05fc62 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 %>
-- 
cgit v1.2.3