summaryrefslogtreecommitdiff
path: root/provider_base
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2014-04-24 13:58:40 -0400
committerMicah Anderson <micah@leap.se>2014-04-24 13:58:40 -0400
commit0a9bcf49adab7120849806e4c6408d3f2887e09a (patch)
treea841fde15ba64dc992e65f060b46bcb6312ab574 /provider_base
parent18ae83d105bfa5c173d00d2fb17b0b72d42205bc (diff)
tor: provide a default 'nickname' (something like
"rabbitLKJYW23695JGLKJ" where rabbit is the node name). Stop shipping a static 'family' and instead provide a comma separated list of node tor nicknames. (#5220) Change-Id: I479f460ab230ad440f72c78dc6362983387ce12a
Diffstat (limited to 'provider_base')
-rw-r--r--provider_base/services/tor.json4
1 files changed, 3 insertions, 1 deletions
diff --git a/provider_base/services/tor.json b/provider_base/services/tor.json
index ae4da46d..7d9c6d34 100644
--- a/provider_base/services/tor.json
+++ b/provider_base/services/tor.json
@@ -1,6 +1,8 @@
{
"tor": {
"bandwidth_rate": 6550,
- "contacts": "= [provider.contacts['tor'] || provider.contacts.default].flatten"
+ "contacts": "= [provider.contacts['tor'] || provider.contacts.default].flatten",
+ "nickname": "= (self.name + secret(:tor_family)).sub('_','')[0..18]",
+ "family": "= nodes[:service => 'tor'].field('tor.nickname').join(',')"
}
}