From 9491f15a64c13f2424b781d32d5734db3bb4a22f Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 21 Nov 2012 13:47:41 -0800
Subject: added x509.commercial_ca_cert. x509.ca_cert is now optional, except
 for webapp.

---
 provider_base/services/webapp.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'provider_base/services')

diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index ca9edf33..bdef5761 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -15,7 +15,9 @@
   },
   "x509": {
     "use": true,
+    "ca_cert": "= file :ca_cert, :missing => 'provider CA. Run `leap init-ca`'",
     "commercial_cert": "= file [:commercial_cert, global.provider.domain]",
-    "commercial_key": "= file [:commercial_key, global.provider.domain]"
+    "commercial_key": "= file [:commercial_key, global.provider.domain]",
+    "commercial_ca_cert": "= try_file :commercial_ca_cert"
   }
 }
\ No newline at end of file
-- 
cgit v1.2.3