summaryrefslogtreecommitdiff
path: root/provider_base/services
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2012-11-22 11:43:23 -0800
committerelijah <elijah@riseup.net>2012-11-22 11:43:23 -0800
commitf3704fc0ac81ca6ccb7e7d19ae931d9c391f3975 (patch)
treed74d17c098583de180be140c06b8090be753d106 /provider_base/services
parent7b803d54a625e13f52a33e1c7a9264b344474df8 (diff)
clean up openvpn and x509 paths
Diffstat (limited to 'provider_base/services')
-rw-r--r--provider_base/services/openvpn.json9
1 files changed, 4 insertions, 5 deletions
diff --git a/provider_base/services/openvpn.json b/provider_base/services/openvpn.json
index 71d1d2c7..15deab70 100644
--- a/provider_base/services/openvpn.json
+++ b/provider_base/services/openvpn.json
@@ -1,7 +1,9 @@
{
"service_type": "user_service",
"x509": {
- "use": true
+ "use": true,
+ "ca_cert": "= file :ca_cert, :missing => 'Certificate Authority. Run `leap init-ca`'",
+ "dh": "= file :dh_params, :missing => 'Diffie-Hellman parameters. Run `leap init-dh`'"
},
"openvpn": {
"location": "Location Unknown",
@@ -9,9 +11,6 @@
"protocols": ["tcp", "udp"],
"filter_dns": false,
"adblock": false,
- "user_ips": false,
- "ca_crt": "= file :ca_cert, :missing => 'Certificate Authority. Run `leap init-ca`'",
- "ca_key": "= file :ca_key, :missing => 'Certificate Authority. Run `leap init-ca`'",
- "dh": "= file :dh_params, :missing => 'Diffie-Hellman parameters. Run `leap init-dh`'"
+ "user_ips": false
}
}