diff options
| author | elijah <elijah@riseup.net> | 2014-10-31 00:01:57 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2014-10-31 00:01:57 -0700 |
| commit | 1d4670f8b9b4c1f3d4cd8017a3f6145ccdd41312 (patch) | |
| tree | d3272ca05c567219d1f9a476b56f2a8cb808cb19 /provider_base/services | |
| parent | d3e24760b33d6ae20f153d3c144d7d443fb0b69e (diff) | |
add support for property tor.key
Diffstat (limited to 'provider_base/services')
| -rw-r--r-- | provider_base/services/tor.json | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/provider_base/services/tor.json b/provider_base/services/tor.json index fc365a19..87fb9682 100644 --- a/provider_base/services/tor.json +++ b/provider_base/services/tor.json @@ -3,6 +3,13 @@ "bandwidth_rate": 6550, "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(',')" + "family": "= nodes[:services => 'tor'][:environment => '!local'].field('tor.nickname').join(',')", + "hidden_service": null, + "key": { + "type": "RSA", + "public": "= tor_public_key_path(:node_tor_pub_key, tor.key.type) if tor.hidden_service", + "private": "= tor_private_key_path(:node_tor_priv_key, tor.key.type) if tor.hidden_service", + "address": "= onion_address(:node_tor_pub_key) if tor.hidden_service" + } } } |