summaryrefslogtreecommitdiff
path: root/provider_base/services
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2012-11-21 13:47:41 -0800
committerelijah <elijah@riseup.net>2012-11-21 13:47:41 -0800
commit9491f15a64c13f2424b781d32d5734db3bb4a22f (patch)
tree266bb0158a108e356b76e0da2c7426c5af9154be /provider_base/services
parentc2d57624c15dfaff038f9991f04ade46b5ad1d40 (diff)
added x509.commercial_ca_cert. x509.ca_cert is now optional, except for webapp.
Diffstat (limited to 'provider_base/services')
-rw-r--r--provider_base/services/webapp.json4
1 files changed, 3 insertions, 1 deletions
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