summaryrefslogtreecommitdiff
path: root/provider_base/services
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-01-21 22:41:51 -0800
committerelijah <elijah@riseup.net>2013-01-21 22:41:51 -0800
commit306a0e6c21d0e27035ba48530392eede59537516 (patch)
tree1d9195dee41e820d9b0b9b5070c06be1126b6218 /provider_base/services
parent9ae011f2cbedfae166281f2f6a097acec35c943b (diff)
client ca -- configure the webapp with the client ca
Diffstat (limited to 'provider_base/services')
-rw-r--r--provider_base/services/openvpn.json2
-rw-r--r--provider_base/services/webapp.json2
2 files changed, 3 insertions, 1 deletions
diff --git a/provider_base/services/openvpn.json b/provider_base/services/openvpn.json
index 0008a2d2..7b67ccb3 100644
--- a/provider_base/services/openvpn.json
+++ b/provider_base/services/openvpn.json
@@ -2,7 +2,7 @@
"service_type": "user_service",
"x509": {
"use": true,
- "ca_cert": "= file :ca_cert, :missing => 'Certificate Authority. Run `leap cert ca`'",
+ "client_ca_cert": "= file :client_ca_cert, :missing => 'Certificate Authority. Run `leap cert ca`'",
"dh": "= file :dh_params, :missing => 'Diffie-Hellman parameters. Run `leap cert dh`'"
},
"openvpn": {
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index 311f1284..c9e4c532 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -23,6 +23,8 @@
"x509": {
"use": true,
"ca_cert": "= file :ca_cert, :missing => 'provider CA. Run `leap cert ca`'",
+ "client_ca_cert": "= file_path :client_ca_cert",
+ "client_ca_key": "= file_path :client_ca_key",
"commercial_cert": "= file [:commercial_cert, global.provider.domain]",
"commercial_key": "= file [:commercial_key, global.provider.domain]",
"commercial_ca_cert": "= try_file :commercial_ca_cert"