diff options
| author | Christoph Kluenter <ckluente@thoughtworks.com> | 2014-12-04 12:09:10 +0100 |
|---|---|---|
| committer | Christoph Kluenter <ckluente@thoughtworks.com> | 2014-12-04 12:09:10 +0100 |
| commit | d063e35d3e29b3cedc810b8e5ca1855c841d8f9e (patch) | |
| tree | 06e5110632156a35e6e879a9fa0455edf62f05bf /provider_base/services/tor.json | |
| parent | 664dca31dec0c7935ee96359209d9dcefc03e38c (diff) | |
| parent | de51b83384d97a67cdbdf1992ba9ad771a292c5d (diff) | |
Merge remote-tracking branch 'leap/develop' into check_dhcp
Diffstat (limited to 'provider_base/services/tor.json')
| -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..55d3d2ee 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": { + "active": null, + "key_type": "RSA", + "public_key": "= tor_public_key_path(:node_tor_pub_key, tor.hidden_service.key_type) if tor.hidden_service.active", + "private_key": "= tor_private_key_path(:node_tor_priv_key, tor.hidden_service.key_type) if tor.hidden_service.active", + "address": "= onion_address(:node_tor_pub_key) if tor.hidden_service.active" + } } } |