summaryrefslogtreecommitdiffstats
path: root/roles/torrelay
diff options
context:
space:
mode:
authorMatthieu Saulnier <fantom@fedoraproject.org>2015-01-01 00:15:03 +0100
committerMatthieu Saulnier <fantom@fedoraproject.org>2015-01-01 00:15:03 +0100
commit3b0cf2647575b8c074e2aac1a9943a596f6a2c7e (patch)
tree8198005957630345a753fd1f7b282861679080ac /roles/torrelay
parent163510477765bf28d762d0a1d6f8e590744f77c4 (diff)
downloadplaybooks-ansible-3b0cf2647575b8c074e2aac1a9943a596f6a2c7e.tar.gz
playbooks-ansible-3b0cf2647575b8c074e2aac1a9943a596f6a2c7e.tar.xz
playbooks-ansible-3b0cf2647575b8c074e2aac1a9943a596f6a2c7e.zip
Add MyFamily option in Tor config and add fingerprints of physical machines
Diffstat (limited to 'roles/torrelay')
-rw-r--r--roles/torrelay/templates/torrc.j22
-rw-r--r--roles/torrelay/vars/main.yml5
2 files changed, 7 insertions, 0 deletions
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