summaryrefslogtreecommitdiff
path: root/installation/caddyfile-pleroma.example
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2019-06-03 09:12:17 -0500
committerMark Felder <feld@FreeBSD.org>2019-06-03 09:12:17 -0500
commitf4e2595592ccca6cedd64669baef7bdd2a6547d0 (patch)
tree6806a79345c7599b0d436df8b6c46e75b54d1292 /installation/caddyfile-pleroma.example
parent3c4cab9be18ff543d025177b418ddd0b16050e68 (diff)
parent9789e000b05621435dc0c03833f564481e0b80e6 (diff)
downloadpleroma-f4e2595592ccca6cedd64669baef7bdd2a6547d0.tar.gz
pleroma-f4e2595592ccca6cedd64669baef7bdd2a6547d0.zip
Merge branch 'develop' into update-oauth-template
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
}