From 0a9bcf49adab7120849806e4c6408d3f2887e09a Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 24 Apr 2014 13:58:40 -0400 Subject: 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 --- provider_base/services/tor.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'provider_base') 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(',')" } } -- cgit v1.2.3