summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-01-30 08:16:31 +0000
committerlambda <pleromagit@rogerbraun.net>2018-01-30 08:16:31 +0000
commit2f23ae5b684a363b6090a45c4b1b9685c9ed614a (patch)
treeab91ff8fbb1101d05378a5e0e3e6156dce9ae68c /README.md
parent189e9d63bc462fe5c0f97d70ffd4bac54aeeae05 (diff)
parent066fe1a697286e38c9e9ef7f2c273c4e7a50ffdc (diff)
downloadpleroma-2f23ae5b684a363b6090a45c4b1b9685c9ed614a.tar.gz
pleroma-2f23ae5b684a363b6090a45c4b1b9685c9ed614a.zip
Merge branch 'pr-upstream-http-proxy' into 'develop'
Pr upstream http proxy See merge request pleroma/pleroma!43
Diffstat (limited to 'README.md')
-rw-r--r--README.md9
1 files changed, 9 insertions, 0 deletions
diff --git a/README.md b/README.md
index 664b8b475..da528e1a2 100644
--- a/README.md
+++ b/README.md
@@ -50,3 +50,12 @@ Logs can be watched by using `journalctl -fu pleroma.service`
### Standalone/run by other means
Run `mix phx.server` in repository's root, it will output log into stdout/stderr
+
+### Using an upstream proxy for federation
+
+Add the following to your `dev.secret.exs` or `prod.secret.exs` if you want to proxify all http requests that pleroma makes to an upstream proxy server:
+
+ config :pleroma, :http,
+ proxy_url: "127.0.0.1:8123"
+
+This is useful for running pleroma inside Tor or i2p.