diff options
| author | Sachin Joshi <satchin.joshi@gmail.com> | 2019-06-23 03:25:50 +0000 |
|---|---|---|
| committer | Sachin Joshi <satchin.joshi@gmail.com> | 2019-06-23 03:25:50 +0000 |
| commit | a0c65bbd6c708b555f457bf24ec07d2d41c3fe4a (patch) | |
| tree | deb176014e3c1dcb87fba2fe1108e276c2100148 /installation/caddyfile-pleroma.example | |
| parent | 1452a96ad6cfd7d250e3f7c10805994cc92016a7 (diff) | |
| parent | 72f365df07e2eba75d3339629b01e5a8913513e6 (diff) | |
| download | pleroma-a0c65bbd6c708b555f457bf24ec07d2d41c3fe4a.tar.gz pleroma-a0c65bbd6c708b555f457bf24ec07d2d41c3fe4a.zip | |
Merge branch 'develop' into 'remove-avatar-header'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'installation/caddyfile-pleroma.example')
| -rw-r--r-- | installation/caddyfile-pleroma.example | 4 |
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 } |