summaryrefslogtreecommitdiff
path: root/installation/caddyfile-pleroma.example
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2019-05-24 21:05:57 +0700
committerEgor Kislitsyn <egor@kislitsyn.com>2019-05-24 21:05:57 +0700
commitf333041a0a2b9c2f1ef2236254b8dd3e9a55a688 (patch)
tree317be4a8b7c0b9a231853ee05547554f5da74c3f /installation/caddyfile-pleroma.example
parent3b71612d3d8b5e2ad53bda4399eb7f687cd6c30e (diff)
parent6499adc6a83b4064f7283de3c729053e62ade7b2 (diff)
downloadpleroma-f333041a0a2b9c2f1ef2236254b8dd3e9a55a688.tar.gz
pleroma-f333041a0a2b9c2f1ef2236254b8dd3e9a55a688.zip
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
Diffstat (limited to 'installation/caddyfile-pleroma.example')
-rw-r--r--installation/caddyfile-pleroma.example4
1 files changed, 3 insertions, 1 deletions
diff --git a/installation/caddyfile-pleroma.example b/installation/caddyfile-pleroma.example
index fcf76718e..7985d9c67 100644
--- a/installation/caddyfile-pleroma.example
+++ b/installation/caddyfile-pleroma.example
@@ -10,7 +10,9 @@ example.tld {
gzip
- proxy / localhost:4000 {
+ # this is explicitly IPv4 since Pleroma.Web.Endpoint binds on IPv4 only
+ # and `localhost.` resolves to [::0] on some systems: see issue #930
+ proxy / 127.0.0.1:4000 {
websocket
transparent
}