From 3b0cf2647575b8c074e2aac1a9943a596f6a2c7e Mon Sep 17 00:00:00 2001 From: Matthieu Saulnier Date: Thu, 1 Jan 2015 00:15:03 +0100 Subject: Add MyFamily option in Tor config and add fingerprints of physical machines --- roles/torrelay/templates/torrc.j2 | 2 ++ roles/torrelay/vars/main.yml | 5 +++++ 2 files changed, 7 insertions(+) (limited to 'roles/torrelay') diff --git a/roles/torrelay/templates/torrc.j2 b/roles/torrelay/templates/torrc.j2 index 74c1e77..6643955 100644 --- a/roles/torrelay/templates/torrc.j2 +++ b/roles/torrelay/templates/torrc.j2 @@ -42,6 +42,8 @@ RelayBandwidthBurst {{ relaybpburst }} KB ContactInfo {{ contactinfo }} DirPort 9030 DirPortFrontPage /usr/local/share/tor/tor-exit-notice.html +MyFamily {% for item in fingerprints %}${{ item }}, {% endfor %} + {% if ansible_default_ipv6.address != exit_ipv6 %} ExitPolicy reject *:* {% endif %} diff --git a/roles/torrelay/vars/main.yml b/roles/torrelay/vars/main.yml index 03b6409..8a5ccd0 100644 --- a/roles/torrelay/vars/main.yml +++ b/roles/torrelay/vars/main.yml @@ -9,3 +9,8 @@ mail_ipv6: 2a01:e35:2f76:7750::4 jabber_ipv6: 2a01:e35:2f76:7750::10 exit_ipv6: 2a00:c70:1:178:170:111:194:c0de btc_ipv6: 2a01:e35:2f76:7750::12 +fingerprints: + - D8AE9C760B74AFE3CA0F48EEB21271E22CF25F7A + - C9B3C1661A9577BA24C1C2C6123918921A495509 + - AA03F59D887B21751552A54CBCCA321CFE6E9228 + - DAF47F992BADEAB31784B82118DB0AF99A0196AF -- cgit