summaryrefslogtreecommitdiff
path: root/docs/configuration
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2023-07-02 21:30:16 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2023-07-02 21:30:16 +0000
commit2b9cd25cf4b27b0ce3437a621f36f7f740cb542a (patch)
tree1d88738a809d64753d6258b26353db1dd7c0387d /docs/configuration
parent02629169782b61f201a210169d13890ce05d889d (diff)
parent8fa435f370cd1a85a37eae011d9db604256fbef1 (diff)
downloadpleroma-2b9cd25cf4b27b0ce3437a621f36f7f740cb542a.tar.gz
pleroma-2b9cd25cf4b27b0ce3437a621f36f7f740cb542a.zip
Merge branch 'tusooa/media-altdomain' into 'develop'
Add instructions to serve media on another domain See merge request pleroma/pleroma!3892
Diffstat (limited to 'docs/configuration')
-rw-r--r--docs/configuration/hardening.md14
1 files changed, 14 insertions, 0 deletions
diff --git a/docs/configuration/hardening.md b/docs/configuration/hardening.md
index d3bfc4e4a..cc46d1ff9 100644
--- a/docs/configuration/hardening.md
+++ b/docs/configuration/hardening.md
@@ -62,6 +62,20 @@ An additional “Expect-CT” header will be sent with the configured `ct_max_ag
If you click on a link, your browser’s request to the other site will include from where it is coming from. The “Referrer policy” header tells the browser how and if it should send this information. (see [Referrer policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy))
+### Uploaded media and media proxy
+
+It is STRONGLY RECOMMENDED to serve both the locally-uploaded media and the media proxy from another domain than the domain that Pleroma runs on, if applicable.
+
+```elixir
+config :pleroma, :media_proxy,
+ base_url: "https://some.other.domain"
+
+config :pleroma, Pleroma.Upload,
+ base_url: "https://some.other.domain/media"
+```
+
+See `installation/pleroma-mediaproxy.nginx` for examples on how to configure your media proxy.
+
## systemd
A systemd unit example is provided at `installation/pleroma.service`.