diff options
| author | Micah Anderson <micah@leap.se> | 2014-05-22 16:38:28 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2014-05-22 16:38:28 -0400 |
| commit | 6100b6ded99241f10e7fb12c13a0820fda084912 (patch) | |
| tree | 863a9120010f32fdae304af94cd102c1da5096a6 /provider_base/services/tor.json | |
| parent | 327d5c934e408f90011d7949b89ab01fed88998e (diff) | |
| parent | a622e49c5df2150049afb6f6ed47177537b7e6da (diff) | |
Merge branch 'develop' (0.5.1)0.5.1
Change-Id: I4e9d845f9758232f4da0d4bfbf785e52982b825b
Diffstat (limited to 'provider_base/services/tor.json')
| -rw-r--r-- | provider_base/services/tor.json | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/provider_base/services/tor.json b/provider_base/services/tor.json index ae4da46d..fc365a19 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[:services => 'tor'][:environment => '!local'].field('tor.nickname').join(',')" } } |