summaryrefslogtreecommitdiff
path: root/provider_base
diff options
context:
space:
mode:
authorirregulator <irregulator@riseup.net>2014-05-28 15:25:21 +0300
committerelijah <elijah@riseup.net>2014-07-01 16:05:41 -0700
commit08f4c51cbbf9a4307375278ab42d31aa65d57645 (patch)
tree41a63e9509e8789a6130c9e9e9954cc7bdec2af4 /provider_base
parent86035bf6936812f5b01ac7d5e3b6d026124e156e (diff)
Include obfsproxy descriptors in openvpn.json
This is needed so as obfsproxy service is automatically deployed along with eip service.
Diffstat (limited to 'provider_base')
-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..1ce397d0 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",
+ "port" : "= rand_range :scramblesuit_port, 18000..32000"
+ },
+ "gateway_address": "= try{openvpn.gateway_address} || try{nodes_like_me[:services => 'openvpn']['location.name' => location.name].field('openvpn.gateway_address').shuffle.first} || try{nodes_like_me[:services => 'openvpn'].field('openvpn.gateway_address').shuffle.first}"
}
}