diff --git a/roles/tor/files/tor-service-override.conf b/roles/tor/files/tor-service-override.conf deleted file mode 100644 index 591a19b..0000000 --- a/roles/tor/files/tor-service-override.conf +++ /dev/null @@ -1,4 +0,0 @@ -[Service] -ExecStart= -ExecStart=/usr/bin/firejail /usr/bin/tor -f /etc/tor/torrc -User=root diff --git a/roles/tor/meta/main.yml b/roles/tor/meta/main.yml index be1a786..49c0cc6 100644 --- a/roles/tor/meta/main.yml +++ b/roles/tor/meta/main.yml @@ -1,5 +1,3 @@ --- dependencies: - - { role: firejail } - - { role: systemd } - { role: nmtrust } diff --git a/roles/tor/tasks/main.yml b/roles/tor/tasks/main.yml index 8ee93f5..0517777 100644 --- a/roles/tor/tasks/main.yml +++ b/roles/tor/tasks/main.yml @@ -6,36 +6,6 @@ - torsocks state: present -- name: Set Tor to run as tor - lineinfile: dest=/etc/tor/torrc - regexp=^User - state=present - line="User tor" - -- name: Create Tor systemd unit file directory - file: path=/etc/systemd/system/tor.service.d state=directory - tags: - - firejail - -- name: Push Tor socket unit file - copy: src=tor-service-override.conf dest=/etc/systemd/system/tor.service.d/override.conf - notify: - - reload systemd config - tags: - - firejail - -- name: Verify Tor firejail local profile exists - file: path=/etc/firejail/tor.local state=touch - tags: - - firejail - -- name: Allow Tor firejail /dev access - lineinfile: - dest: /etc/firejail/tor.local - line: "ignore private-dev" - tags: - - firejail - - include_tasks: roles/nmtrust/tasks/unit.yml vars: unit: tor.service