diff options
| author | lambda <lain@soykaf.club> | 2019-05-24 09:54:45 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-05-24 09:54:45 +0000 |
| commit | 6499adc6a83b4064f7283de3c729053e62ade7b2 (patch) | |
| tree | 94f316fd8392ef293037a102f5c2dc95fe504280 /installation/pleroma-apache.conf | |
| parent | 75e78d4e239a5c999306e92b181b0e29c52dc9db (diff) | |
| parent | 356c047759735bcd984ebd44059a21a3cf22af0e (diff) | |
| download | pleroma-6499adc6a83b4064f7283de3c729053e62ade7b2.tar.gz pleroma-6499adc6a83b4064f7283de3c729053e62ade7b2.zip | |
Merge branch 'reverse_proxy_upstream_v4_fix' into 'develop'
explicitly set reverse proxy upstream to IPv4
Closes #930
See merge request pleroma/pleroma!1197
Diffstat (limited to 'installation/pleroma-apache.conf')
| -rw-r--r-- | installation/pleroma-apache.conf | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/installation/pleroma-apache.conf b/installation/pleroma-apache.conf index 2beb7c4cc..b5640ac3d 100644 --- a/installation/pleroma-apache.conf +++ b/installation/pleroma-apache.conf @@ -58,8 +58,10 @@ CustomLog ${APACHE_LOG_DIR}/access.log combined RewriteRule /(.*) ws://localhost:4000/$1 [P,L] ProxyRequests off - ProxyPass / http://localhost:4000/ - ProxyPassReverse / http://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 + ProxyPass / http://127.0.0.1:4000/ + ProxyPassReverse / http://127.0.0.1:4000/ RequestHeader set Host ${servername} ProxyPreserveHost On |