diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-06 09:30:49 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-06 09:30:49 +0300 |
| commit | f459aabdfafa990b33610438650f882ccac072d2 (patch) | |
| tree | e5bfcb4f8fc7c2dd06e08f90b3a841c4f9ad759a /docs/config/howto_proxy.md | |
| parent | 6ffa2b5f661c2db424334c6fb5de6f4d1bfeb745 (diff) | |
| parent | 9e34919dcdbeedf8eb623dc86b05f63ef44d8859 (diff) | |
| download | pleroma-f459aabdfafa990b33610438650f882ccac072d2.tar.gz | |
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
# 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} -``` |