TOR federation (#7875)

diff --git a/docker-compose.yml b/docker-compose.yml
index 496fb2548742ea51dbb59c79252095643073bc5a..b31095a54074b202bb1aa47f32c6f986d1fbf8f1 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -80,6 +80,24 @@ services:
     volumes:
       - ./public/packs:/mastodon/public/packs
       - ./public/system:/mastodon/public/system
+## Uncomment to enable federation with tor instances along with adding the following ENV variables
+## http_proxy=http://privoxy:8118
+## ALLOW_ACCESS_TO_HIDDEN_SERVICE=true
+## HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY=true
+#  tor:
+#    build: https://github.com/usbsnowcrash/docker-tor.git
+#    networks:
+#      - external_network
+#      - internal_network
+#
+#  privoxy:
+#    build: https://github.com/usbsnowcrash/docker-privoxy.git
+#    command: /opt/sbin/privoxy --no-daemon --user privoxy.privoxy /opt/config
+#    volumes:
+#      - ./priv-config:/opt/config
+#    networks:
+#      - external_network
+#      - internal_network
 
 networks:
   external_network:

diff --git a/priv-config b/priv-config
new file mode 100644 (file)
index 0000000..1cea49d
--- /dev/null
+++ b/priv-config
@@ -0,0 +1,4 @@
+listen-address  0.0.0.0:8118
+
+forward .   .
+forward-socks5t .onion  tor:9050    .
\ No newline at end of file