From 6372f55a7bce2ad2ce569efb3db5c14ad3b75e08 Mon Sep 17 00:00:00 2001 From: fsociety Date: Sat, 7 Sep 2024 16:37:58 +0200 Subject: [PATCH] feat: add Tor support for relay service Add Tor support for the relay service in the docker-compose file. Also, rename the service from `wot-relay` to `relay`. Add a new `torrc` configuration file and a `.gitignore` file in the `tor/data` directory to prevent sensitive data from being tracked. Also, create a new `docker-compose.tor.yml` file for Tor-specific configurations. --- docker-compose.tor.yml | 26 ++++++++++++++++++++++++++ docker-compose.yml | 2 +- tor/data/.gitignore | 2 ++ tor/torrc | 2 ++ 4 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 docker-compose.tor.yml create mode 100644 tor/data/.gitignore create mode 100644 tor/torrc diff --git a/docker-compose.tor.yml b/docker-compose.tor.yml new file mode 100644 index 0000000..15d5760 --- /dev/null +++ b/docker-compose.tor.yml @@ -0,0 +1,26 @@ +services: + relay: + container_name: wot-relay + build: + context: . + dockerfile: Dockerfile + env_file: + - .env + volumes: + - "./db:/app/db" + - "./templates/index.html:/app/templates/index.html" + - "./templates/static:/app/templates/static" + ports: + - "3334" # disable clearnet access + #- "3334:3334" # enable clearnet access + + tor: + image: lncm/tor:0.4.7.9@sha256:86c2fe9d9099e6376798979110b8b9a3ee5d8adec27289ac4a5ee892514ffe92 + container_name: wot-relay-tor + depends_on: + - relay + volumes: + - ./tor/torrc:/etc/tor/torrc + - ./tor/data:/var/lib/tor + restart: on-failure + stop_grace_period: 10m30s diff --git a/docker-compose.yml b/docker-compose.yml index 5b03ad6..13ca973 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ services: - wot-relay: + relay: container_name: wot-relay build: context: . diff --git a/tor/data/.gitignore b/tor/data/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/tor/data/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/tor/torrc b/tor/torrc new file mode 100644 index 0000000..e8e0702 --- /dev/null +++ b/tor/torrc @@ -0,0 +1,2 @@ +HiddenServiceDir /var/lib/tor/relay +HiddenServicePort 80 relay:3334