diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-07-09 07:05:29 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-07-09 07:13:59 +0200 |
| commit | d392020da6ff4511a2925b327de23933f374bea3 (patch) | |
| tree | e86a590276a96ef72d5ed49f79998e7680969cb6 /docker-compose.yml | |
| parent | c699b2d141d7aa910bd81ae5fe881ecec7039395 (diff) | |
| parent | 1ca4e51eb38de6de81cedf3ddcdaa626f1d1c569 (diff) | |
Merge branch 'master' into glitch-soc/tentative-merge
Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 496fb2548..c54c73e44 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -80,6 +80,23 @@ 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 +# 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: |