diff options
| author | Matthieu Saulnier <fantom@fedoraproject.org> | 2018-10-19 22:49:57 +0200 |
|---|---|---|
| committer | Matthieu Saulnier <fantom@fedoraproject.org> | 2018-10-19 22:49:57 +0200 |
| commit | b06582d3c4bf5657a83d978e506232a0dd475026 (patch) | |
| tree | a7c62517215776c1aaac7d1e704a0a3ccf273c42 | |
| parent | 25003e9d0d9576ece15d378280f62401a416d557 (diff) | |
| download | playbooks-ansible-b06582d3c4bf5657a83d978e506232a0dd475026.tar.gz playbooks-ansible-b06582d3c4bf5657a83d978e506232a0dd475026.tar.xz playbooks-ansible-b06582d3c4bf5657a83d978e506232a0dd475026.zip | |
Add tor bridge configuration template and set manchester host as a bridge
| -rw-r--r-- | host_vars/192.168.0.25 | 5 | ||||
| -rw-r--r-- | host_vars/192.168.0.26 | 5 | ||||
| -rw-r--r-- | host_vars/d72vewh3wa4lwpaj.onion | 5 | ||||
| -rw-r--r-- | host_vars/lancaster.casperlefantom.net | 8 | ||||
| -rw-r--r-- | host_vars/lancaster.home.casperlefantom.net | 8 | ||||
| -rw-r--r-- | host_vars/manchester.casperlefantom.net | 5 | ||||
| -rw-r--r-- | host_vars/manchester.home.casperlefantom.net | 5 | ||||
| -rw-r--r-- | roles/torrelay/templates/torrc.j2 | 6 |
8 files changed, 11 insertions, 36 deletions
diff --git a/host_vars/192.168.0.25 b/host_vars/192.168.0.25 index 8cb7680..0cb82cb 100644 --- a/host_vars/192.168.0.25 +++ b/host_vars/192.168.0.25 @@ -1,8 +1,5 @@ is_dnsmaster: true is_ntpmaster: true -nickname: Casper01 -bprate: '80 KB' -bpburst: '100 KB' -is_gardian: true +is_bridge: true is_mtamaster: true is_tormaster: true diff --git a/host_vars/192.168.0.26 b/host_vars/192.168.0.26 index 8cb7680..0cb82cb 100644 --- a/host_vars/192.168.0.26 +++ b/host_vars/192.168.0.26 @@ -1,8 +1,5 @@ is_dnsmaster: true is_ntpmaster: true -nickname: Casper01 -bprate: '80 KB' -bpburst: '100 KB' -is_gardian: true +is_bridge: true is_mtamaster: true is_tormaster: true diff --git a/host_vars/d72vewh3wa4lwpaj.onion b/host_vars/d72vewh3wa4lwpaj.onion index 8cb7680..0cb82cb 100644 --- a/host_vars/d72vewh3wa4lwpaj.onion +++ b/host_vars/d72vewh3wa4lwpaj.onion @@ -1,8 +1,5 @@ is_dnsmaster: true is_ntpmaster: true -nickname: Casper01 -bprate: '80 KB' -bpburst: '100 KB' -is_gardian: true +is_bridge: true is_mtamaster: true is_tormaster: true diff --git a/host_vars/lancaster.casperlefantom.net b/host_vars/lancaster.casperlefantom.net deleted file mode 100644 index 8cb7680..0000000 --- a/host_vars/lancaster.casperlefantom.net +++ /dev/null @@ -1,8 +0,0 @@ -is_dnsmaster: true -is_ntpmaster: true -nickname: Casper01 -bprate: '80 KB' -bpburst: '100 KB' -is_gardian: true -is_mtamaster: true -is_tormaster: true diff --git a/host_vars/lancaster.home.casperlefantom.net b/host_vars/lancaster.home.casperlefantom.net deleted file mode 100644 index 8cb7680..0000000 --- a/host_vars/lancaster.home.casperlefantom.net +++ /dev/null @@ -1,8 +0,0 @@ -is_dnsmaster: true -is_ntpmaster: true -nickname: Casper01 -bprate: '80 KB' -bpburst: '100 KB' -is_gardian: true -is_mtamaster: true -is_tormaster: true diff --git a/host_vars/manchester.casperlefantom.net b/host_vars/manchester.casperlefantom.net index 8cb7680..0cb82cb 100644 --- a/host_vars/manchester.casperlefantom.net +++ b/host_vars/manchester.casperlefantom.net @@ -1,8 +1,5 @@ is_dnsmaster: true is_ntpmaster: true -nickname: Casper01 -bprate: '80 KB' -bpburst: '100 KB' -is_gardian: true +is_bridge: true is_mtamaster: true is_tormaster: true diff --git a/host_vars/manchester.home.casperlefantom.net b/host_vars/manchester.home.casperlefantom.net index 8cb7680..0cb82cb 100644 --- a/host_vars/manchester.home.casperlefantom.net +++ b/host_vars/manchester.home.casperlefantom.net @@ -1,8 +1,5 @@ is_dnsmaster: true is_ntpmaster: true -nickname: Casper01 -bprate: '80 KB' -bpburst: '100 KB' -is_gardian: true +is_bridge: true is_mtamaster: true is_tormaster: true diff --git a/roles/torrelay/templates/torrc.j2 b/roles/torrelay/templates/torrc.j2 index 1d15607..2d1da48 100644 --- a/roles/torrelay/templates/torrc.j2 +++ b/roles/torrelay/templates/torrc.j2 @@ -51,6 +51,12 @@ DirPort {{ pop3port }} {% endif %} +{% if is_bridge is defined %} +ORPort {{ pop3sport }} +BridgeRelay 1 +{% endif %} + + {% if nickname is defined %} {% if tor_address is defined %} Address {{ tor_address }} |