summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2012-11-23 01:53:34 -0800
committerelijah <elijah@riseup.net>2012-11-23 01:53:34 -0800
commit3c253f7015540dde8e2402ba084cc48a70403d33 (patch)
tree804e4e608b30f6903c12aafd3cb8e9ef89005bc2
parentf3704fc0ac81ca6ccb7e7d19ae931d9c391f3975 (diff)
fix bugs in eip-service.json template
-rw-r--r--provider_base/files/service-definitions/eip-service.json.erb8
1 files changed, 6 insertions, 2 deletions
diff --git a/provider_base/files/service-definitions/eip-service.json.erb b/provider_base/files/service-definitions/eip-service.json.erb
index 095f3530..8dc7211d 100644
--- a/provider_base/files/service-definitions/eip-service.json.erb
+++ b/provider_base/files/service-definitions/eip-service.json.erb
@@ -17,7 +17,7 @@
gateway["capabilities"] = node.openvpn.pick(
:ports, :protocols, :user_ips, :adblock, :filter_dns)
gateway["capabilities"]["transport"] = ["openvpn"]
- gateway["ip_address"] = node.ip_address
+ gateway["ip_address"] = node.openvpn.gateway_address
gateway["host"] = node.domain.full
gateway["cluster"] = underscore(node.openvpn.location)
gateways << gateway
@@ -28,6 +28,10 @@
end
hsh["gateways"] = gateways
hsh["clusters"] = clusters.values
-
+ hsh["openvpn_configuration"] = {
+ "tls-cipher" => "DHE-RSA-AES128-SHA",
+ "auth" => "SHA1",
+ "cipher" => "AES-128-CBC"
+ }
generate_json hsh
%> \ No newline at end of file