diff options
| author | feld <feld@feld.me> | 2019-10-04 14:16:28 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2019-10-04 14:16:28 +0000 |
| commit | 31e57cd1b34798afb07a8de4c0c95ef3c15e22ed (patch) | |
| tree | 461d3d50b855d080eb17f0946213168a87ac7625 /docs/config/howto_proxy.md | |
| parent | b8b98ac40f042a8c3d2562edc095f0e1a309760f (diff) | |
| parent | 27110793a7d8e3aa6434bde63a1f687424ae779c (diff) | |
| download | pleroma-31e57cd1b34798afb07a8de4c0c95ef3c15e22ed.tar.gz pleroma-31e57cd1b34798afb07a8de4c0c95ef3c15e22ed.zip | |
Merge branch 'develop' into 'fix/extended-nickname-format-default-config'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'docs/config/howto_proxy.md')
| -rw-r--r-- | docs/config/howto_proxy.md | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/docs/config/howto_proxy.md b/docs/config/howto_proxy.md deleted file mode 100644 index 10a635266..000000000 --- a/docs/config/howto_proxy.md +++ /dev/null @@ -1,12 +0,0 @@ -# How to configure upstream proxy for federation -If you want to proxify all http requests (e.g. for TOR) that pleroma makes to an upstream proxy server, edit you config file (`dev.secret.exs` or `prod.secret.exs`) and add the following: - -``` -config :pleroma, :http, - proxy_url: "127.0.0.1:8123" -``` - -The other way to do it, for example, with Tor you would most likely add something like this: -``` -config :pleroma, :http, proxy_url: {:socks5, :localhost, 9050} -``` |