diff --git a/plinth/modules/tor/privileged.py b/plinth/modules/tor/privileged.py index 1aec47b85..230b00aac 100644 --- a/plinth/modules/tor/privileged.py +++ b/plinth/modules/tor/privileged.py @@ -494,5 +494,7 @@ def uninstall(): for directory in directories: shutil.rmtree(directory, ignore_errors=True) - os.unlink(f'/var/run/tor-instances/{INSTANCE_NAME}.defaults') + defaults_file = f'/var/run/tor-instances/{INSTANCE_NAME}.defaults' + pathlib.Path(defaults_file).unlink(missing_ok=True) + action_utils.service_unmask(SERVICE_NAME) diff --git a/plinth/modules/torproxy/privileged.py b/plinth/modules/torproxy/privileged.py index 883df4a79..056b32316 100644 --- a/plinth/modules/torproxy/privileged.py +++ b/plinth/modules/torproxy/privileged.py @@ -2,7 +2,7 @@ """Configure Tor Proxy service.""" import logging -import os +import pathlib import shutil from typing import Any @@ -190,5 +190,7 @@ def uninstall(): for directory in directories: shutil.rmtree(directory, ignore_errors=True) - os.unlink(f'/var/run/tor-instances/{INSTANCE_NAME}.defaults') + defaults_file = f'/var/run/tor-instances/{INSTANCE_NAME}.defaults' + pathlib.Path(defaults_file).unlink(missing_ok=True) + action_utils.service_unmask(SERVICE_NAME)