summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorirregulator <irregulator@riseup.net>2014-05-30 04:04:24 +0300
committerelijah <elijah@riseup.net>2014-07-01 16:05:41 -0700
commit02963cea38c916256a6c9c959c58ed5a222f1767 (patch)
treeea6100bad5606b68f852af2d500b06e582fc06d8
parent791e22b136910ecfa204eb78be747baed2b02590 (diff)
Attach node's name to scramblesuit password and port secrets
This makes every node with obfsproxy service have unique port and password for scramblesuit pluggable transport.
-rw-r--r--provider_base/services/obfsproxy.json4
-rw-r--r--provider_base/services/openvpn.json4
2 files changed, 4 insertions, 4 deletions
diff --git a/provider_base/services/obfsproxy.json b/provider_base/services/obfsproxy.json
index b14a0db9..ab92c11f 100644
--- a/provider_base/services/obfsproxy.json
+++ b/provider_base/services/obfsproxy.json
@@ -1,8 +1,8 @@
{
"obfsproxy": {
"scramblesuit": {
- "password": "= base32_secret :scramblesuit_password",
- "port" : "= rand_range :scramblesuit_port, 18000..32000"
+ "password": "= base32_secret('scramblesuit_password_'+name)",
+ "port" : "= rand_range('scramblesuit_port_'+name, 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}"
}
diff --git a/provider_base/services/openvpn.json b/provider_base/services/openvpn.json
index 1ce397d0..c62fa04b 100644
--- a/provider_base/services/openvpn.json
+++ b/provider_base/services/openvpn.json
@@ -29,8 +29,8 @@
},
"obfsproxy": {
"scramblesuit": {
- "password": "= base32_secret :scramblesuit_password",
- "port" : "= rand_range :scramblesuit_port, 18000..32000"
+ "password": "= base32_secret('scramblesuit_password_'+name)",
+ "port" : "= rand_range('scramblesuit_port_'+name, 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}"
}