tor1: bridge --> relay (#265)

Co-authored-by: Michael Grote <michael.grote@posteo.de>
Reviewed-on: mg/ansible#265
Co-authored-by: mg <michael.grote@posteo.de>
Co-committed-by: mg <michael.grote@posteo.de>

group_vars/tor.yml

@@ -8,8 +8,7 @@
   tor_control_socket: 0
   tor_contact_info: webmaster(at)mgrote(dot)net
   tor_control_port: 9051
-  tor_mode: bridge
+  tor_mode: relay
-  tor_bridge_port: 5555
   ### oefenweb.ufw
   ufw_rules:
     - rule: allow

roles/mgrote.tor-node/tasks/bridge.yml

@@ -1,27 +1,8 @@
 ---
-  - name: install dependencies
+  - name: install obsf packages
-    become: yes
-    ansible.builtin.package:
-      name: apt-transport-https
-      state: present
-
-  - name: add tor repo key
-    ansible.builtin.apt_key:
-      url: https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc
-      state: present
-
-  - name: add tor repo
-    ansible.builtin.apt_repository:
-      repo: deb https://deb.torproject.org/torproject.org {{ ansible_distribution_release }} main
-      state: present
-      filename: tor
-
-  - name: install tor packages
     become: yes
     ansible.builtin.package:
       name:
-        - tor
-        - deb.torproject.org-keyring
         - obfs4proxy
       state: present
     notify: restart tor

roles/mgrote.tor-node/tasks/main.yml

@@ -1,4 +1,30 @@
 ---
+  - name: install dependencies
+    become: yes
+    ansible.builtin.package:
+      name: apt-transport-https
+      state: present
+
+  - name: add tor repo key
+    ansible.builtin.apt_key:
+      url: https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc
+      state: present
+
+  - name: add tor repo
+    ansible.builtin.apt_repository:
+      repo: deb https://deb.torproject.org/torproject.org {{ ansible_distribution_release }} main
+      state: present
+      filename: tor
+
+  - name: install tor packages
+    become: yes
+    ansible.builtin.package:
+      name:
+        - tor
+        - deb.torproject.org-keyring
+      state: present
+    notify: restart tor
+
   - name: include bridge tasks
     include_tasks: bridge.yml
     when:
@@ -8,3 +34,6 @@
     include_tasks: relay.yml
     when:
       - tor_mode == 'relay'
+
+  - name: include nyx tasks
+    include_tasks: nyx.yml

roles/mgrote.tor-node/tasks/nyx.yml

@@ -0,0 +1,8 @@
+---
+  - name: install nyx packages
+    become: yes
+    ansible.builtin.package:
+      name:
+        - nyx
+      state: present
+    notify: restart tor

roles/mgrote.tor-node/tasks/relay.yml

@@ -1,30 +1,4 @@
 ---
-  - name: install dependencies
-    become: yes
-    ansible.builtin.package:
-      name: apt-transport-https
-      state: present
-
-  - name: add tor repo key
-    ansible.builtin.apt_key:
-      url: https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc
-      state: present
-
-  - name: add tor repo
-    ansible.builtin.apt_repository:
-      repo: deb https://deb.torproject.org/torproject.org {{ ansible_distribution_release }} main
-      state: present
-      filename: tor
-
-  - name: install tor packages
-    become: yes
-    ansible.builtin.package:
-      name:
-        - tor
-        - deb.torproject.org-keyring
-      state: present
-    notify: restart tor
-
   - name: templating torrc
     become: yes
     ansible.builtin.template: