summaryrefslogtreecommitdiff
path: root/docs/config/howto_proxy.md
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-04-08 14:10:43 +0200
committerlain <lain@soykaf.club>2019-04-08 14:10:43 +0200
commit5d871173d189a0019fda0ee76f8a324d90a163ee (patch)
treec3e423993ff5289dd0ba73a94881bd52d9cda1c2 /docs/config/howto_proxy.md
parent037fefe21871ee0a1926286c87c334ea1d339394 (diff)
parentaac48d0cc6893c231c88d5cd7fe0334353bbf299 (diff)
downloadpleroma-5d871173d189a0019fda0ee76f8a324d90a163ee.tar.gz
pleroma-5d871173d189a0019fda0ee76f8a324d90a163ee.zip
Merge branch 'features/mastoapi/2.6.0-conversations' of git.pleroma.social:pleroma/pleroma into features/mastoapi/2.6.0-conversations
Diffstat (limited to 'docs/config/howto_proxy.md')
-rw-r--r--docs/config/howto_proxy.md12
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}
+```