diff options
author | lain <lain@soykaf.club> | 2019-10-10 14:40:59 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2019-10-10 14:40:59 +0200 |
commit | c54ae662dcc08c0c04a1dff7bb7a361665e877b8 (patch) | |
tree | afb9cce0d7bcc15cd2fe3221609d7883d45d0057 /docs/config/howto_proxy.md | |
parent | 02f8e2a8ab65c3e8497bab4576ce4e75f8df3217 (diff) | |
parent | 6355694309b0bad3687a8a7820b81ebf6625751d (diff) | |
download | pleroma-c54ae662dcc08c0c04a1dff7bb7a361665e877b8.tar.gz pleroma-c54ae662dcc08c0c04a1dff7bb7a361665e877b8.zip |
Merge remote-tracking branch 'origin/develop' into benchmark-finishing
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} -``` |