diff options
| author | elijah <elijah@riseup.net> | 2014-07-01 16:06:22 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2014-07-01 16:06:22 -0700 |
| commit | b2f184c027c166c86c2c2e434389542e42bd9304 (patch) | |
| tree | 3c7e703452da8c4caca3469f08c63f4e3041b71c /provider_base/services | |
| parent | 82dbbf823d6637082f63e55ed1d2f57a11e0d481 (diff) | |
| parent | 7e278f92f34e3809d380be724f0c306430791b10 (diff) | |
Merge branch 'obfsproxy' into develop
Diffstat (limited to 'provider_base/services')
| -rw-r--r-- | provider_base/services/obfsproxy.json | 9 | ||||
| -rw-r--r-- | provider_base/services/openvpn.json | 7 |
2 files changed, 16 insertions, 0 deletions
diff --git a/provider_base/services/obfsproxy.json b/provider_base/services/obfsproxy.json new file mode 100644 index 00000000..979d0ef9 --- /dev/null +++ b/provider_base/services/obfsproxy.json @@ -0,0 +1,9 @@ +{ + "obfsproxy": { + "scramblesuit": { + "password": "= base32_secret('scramblesuit_password_'+name)", + "port" : "= rand_range('scramblesuit_port_'+name, 18000..32000)" + }, + "gateway_address": "= try{pick_node(:obfs_gateway,nodes_near_me['services' => 'openvpn']).pick_fields('openvpn.gateway_address')} || try{pick_node(:obfs_gateway,nodes_like_me['services' => 'openvpn']).pick_fields('openvpn.gateway_address')}" + } +} 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" } } |