diff options
| author | Sachin Joshi <satchin.joshi@gmail.com> | 2019-06-01 11:42:37 +0545 |
|---|---|---|
| committer | Sachin Joshi <satchin.joshi@gmail.com> | 2019-06-01 11:42:37 +0545 |
| commit | ad5263c647aea65dbeb4c329825671895e0a8863 (patch) | |
| tree | 6217011a3fd2ea943498ce296de07cefe1206b87 /installation/pleroma-apache.conf | |
| parent | 5534d4c67675901ab272ee47355ad43dfae99033 (diff) | |
| parent | f1890d2cacfa09dd22b06a8d041c04dbeba9e138 (diff) | |
| download | pleroma-ad5263c647aea65dbeb4c329825671895e0a8863.tar.gz pleroma-ad5263c647aea65dbeb4c329825671895e0a8863.zip | |
Merge remote-tracking branch 'upstream/develop' into admin-create-users
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 |