diff options
author | elijah <elijah@riseup.net> | 2014-06-25 14:37:52 -0700 |
---|---|---|
committer | elijah <elijah@riseup.net> | 2014-06-25 14:37:52 -0700 |
commit | c463cb45bafeb308aa778844f3a0a7eadb467597 (patch) | |
tree | 3fba3ed849ae386d45789c2651ca154e9037e0a9 /provider_base/services/monitor.json | |
parent | ffe760c06b3189bc5d67653e952fd44fdb0f08cf (diff) | |
parent | fba004bc8cbee0d9556538342ce78ac1c9d1229b (diff) |
Merge branch 'develop' into feature/couch
Diffstat (limited to 'provider_base/services/monitor.json')
-rw-r--r-- | provider_base/services/monitor.json | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/provider_base/services/monitor.json b/provider_base/services/monitor.json index 03f6c6d1..c24724bf 100644 --- a/provider_base/services/monitor.json +++ b/provider_base/services/monitor.json @@ -12,11 +12,9 @@ }, "x509": { "use": true, + "use_commercial": true, "ca_cert": "= file :ca_cert, :missing => 'provider CA. Run `leap cert ca`'", "client_ca_cert": "= file :client_ca_cert, :missing => 'Certificate Authority. Run `leap cert ca`'", - "client_ca_key": "= file :client_ca_key, :missing => 'Certificate Authority. Run `leap cert ca`'", - "commercial_cert": "= file [:commercial_cert, domain.full_suffix]", - "commercial_key": "= file [:commercial_key, domain.full_suffix]", - "commercial_ca_cert": "= try_file :commercial_ca_cert" + "client_ca_key": "= file :client_ca_key, :missing => 'Certificate Authority. Run `leap cert ca`'" } } |