From 905bd2478811b6c86662ce4487ca52aab3e583fc Mon Sep 17 00:00:00 2001
From: J Yeary <usbsnowcrash@users.noreply.github.com>
Date: Tue, 26 Jun 2018 14:34:12 -0400
Subject: [PATCH] TOR federation (#7875)

---
 docker-compose.yml | 18 ++++++++++++++++++
 priv-config        |  4 ++++
 2 files changed, 22 insertions(+)
 create mode 100644 priv-config

diff --git a/docker-compose.yml b/docker-compose.yml
index 496fb2548..b31095a54 100644
--- 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
index 000000000..1cea49d45
--- /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