summaryrefslogtreecommitdiff
path: root/provider_base/services/openvpn.json
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2014-07-01 16:06:22 -0700
committerelijah <elijah@riseup.net>2014-07-01 16:06:22 -0700
commitb2f184c027c166c86c2c2e434389542e42bd9304 (patch)
tree3c7e703452da8c4caca3469f08c63f4e3041b71c /provider_base/services/openvpn.json
parent82dbbf823d6637082f63e55ed1d2f57a11e0d481 (diff)
parent7e278f92f34e3809d380be724f0c306430791b10 (diff)
Merge branch 'obfsproxy' into develop
Diffstat (limited to 'provider_base/services/openvpn.json')
-rw-r--r--provider_base/services/openvpn.json7
1 files changed, 7 insertions, 0 deletions
diff --git a/provider_base/services/openvpn.json b/provider_base/services/openvpn.json
index 090afcd6..1906244c 100644
--- a/provider_base/services/openvpn.json
+++ b/provider_base/services/openvpn.json
@@ -26,5 +26,12 @@
"keepalive": "10 30",
"tun-ipv6": true
}
+ },
+ "obfsproxy": {
+ "scramblesuit": {
+ "password": "= base32_secret('scramblesuit_password_'+name)",
+ "port" : "= rand_range('scramblesuit_port_'+name, 18000..32000)"
+ },
+ "gateway_address": "= openvpn.gateway_address"
}
}