diff options
author | elijah <elijah@riseup.net> | 2012-11-15 01:18:10 -0800 |
---|---|---|
committer | elijah <elijah@riseup.net> | 2012-11-15 01:18:10 -0800 |
commit | 74047765ad815ae72a1e0eb2355e6fbc68d4db57 (patch) | |
tree | 54b245aefdfbba6c24e148e2fd1b12c5803e72b0 /provider_base/services | |
parent | ac74640c5f4a65f8f117deeaed8d1cd29a22bc3c (diff) |
added eip-service.json
Diffstat (limited to 'provider_base/services')
-rw-r--r-- | provider_base/services/openvpn.json | 5 | ||||
-rw-r--r-- | provider_base/services/webapp.json | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/provider_base/services/openvpn.json b/provider_base/services/openvpn.json index 4b7d25ec..46dcd50e 100644 --- a/provider_base/services/openvpn.json +++ b/provider_base/services/openvpn.json @@ -4,9 +4,12 @@ "use": true }, "openvpn": { + "location": "Location Unknown", "ports": ["80", "443", "53", "1194"], + "protocols": ["tcp", "udp"], "filter_dns": false, - "nat": true, + "adblock": false, + "user_ips": false, "ca_crt": "= file :ca_cert", "ca_key": "= file :ca_key", "dh": "= file :dh_params" diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json index 6e5c029c..7e12d26e 100644 --- a/provider_base/services/webapp.json +++ b/provider_base/services/webapp.json @@ -5,8 +5,8 @@ "couchdb_user": "= global.services[:couchdb].couch.users[:webapp]" }, "definition_files": { - "provider": "= file('service-definitions/provider.json.erb')", - "eip_service": "file('service-definitions/eip-service.json.erb')" + "provider": "= file 'service-definitions/provider.json.erb'", + "eip_service": "= file 'service-definitions/eip-service.json.erb'" }, "service_type": "public_service", "api_domain": "= 'api.' + domain.full_suffix", |