aboutsummaryrefslogtreecommitdiff
path: root/docs/config/howto_proxy.md
diff options
context:
space:
mode:
authorMaxim Filippov <colixer@gmail.com>2019-10-07 15:41:41 +0300
committerMaxim Filippov <colixer@gmail.com>2019-10-07 15:41:41 +0300
commit35068baf65f1be9ac4e5ae8d08222244ae823fcc (patch)
tree0ed0b88fd100fb3df83400c147ab9a6a88d53c73 /docs/config/howto_proxy.md
parent7aceaa517be7b109a9acc15fb4914535b536b66c (diff)
parent0a99f1e8c5551dcf170722e5087a0401b2d907af (diff)
downloadpleroma-35068baf65f1be9ac4e5ae8d08222244ae823fcc.tar.gz
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
Diffstat (limited to 'docs/config/howto_proxy.md')
-rw-r--r--docs/config/howto_proxy.md12
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}
-```