diff options
author | Alex S <alex.strizhakov@gmail.com> | 2019-05-01 12:29:33 +0700 |
---|---|---|
committer | Alex S <alex.strizhakov@gmail.com> | 2019-05-01 12:29:33 +0700 |
commit | bdfa3a6fa87f95e93aa853ec4961645215f31221 (patch) | |
tree | 467b9dd762c9878541e34f2b38a1c58e387c8f2c /docs/config/howto_proxy.md | |
parent | 97b35e00b049c8f908484163b5ffdbcb55db7867 (diff) | |
parent | 77690b9d03facf74483e3379f72b5b51c9f1bd4e (diff) | |
download | pleroma-bdfa3a6fa87f95e93aa853ec4961645215f31221.tar.gz pleroma-bdfa3a6fa87f95e93aa853ec4961645215f31221.zip |
Merging with develop
Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex
Diffstat (limited to 'docs/config/howto_proxy.md')
-rw-r--r-- | docs/config/howto_proxy.md | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/docs/config/howto_proxy.md b/docs/config/howto_proxy.md new file mode 100644 index 000000000..10a635266 --- /dev/null +++ b/docs/config/howto_proxy.md @@ -0,0 +1,12 @@ +# 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} +``` |