diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-03-08 10:38:35 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-03-08 10:38:35 +0000 |
| commit | e8493431bfc16977e43715bf8bdb09ac46580028 (patch) | |
| tree | 2e1a0068583ca62870a15590c4ccba237999f51a /installation | |
| parent | 42f76306e7fe69fc51be00285a4fef8569f54989 (diff) | |
| parent | e7c49d51d724680c1f19888ea409687733753c7b (diff) | |
| download | pleroma-2.0.0.tar.gz | |
Merge branch 'release/2.0.0' into 'stable'v2.0.0
Release/2.0.0
See merge request pleroma/pleroma!2273
Diffstat (limited to 'installation')
| -rwxr-xr-x | installation/download-mastofe-build.sh | 2 | ||||
| -rwxr-xr-x | installation/pleroma-mongooseim.cfg | 8 | ||||
| -rw-r--r-- | installation/pleroma.nginx | 1 |
3 files changed, 8 insertions, 3 deletions
diff --git a/installation/download-mastofe-build.sh b/installation/download-mastofe-build.sh index 7e293867d..ee9e1c217 100755 --- a/installation/download-mastofe-build.sh +++ b/installation/download-mastofe-build.sh @@ -1,6 +1,6 @@ #!/bin/sh # Pleroma: A lightweight social networking server -# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/> +# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only project_id="74" project_branch="rebase/glitch-soc" diff --git a/installation/pleroma-mongooseim.cfg b/installation/pleroma-mongooseim.cfg index d7567321f..576f83541 100755 --- a/installation/pleroma-mongooseim.cfg +++ b/installation/pleroma-mongooseim.cfg @@ -215,7 +215,9 @@ ]} ]}, - { 5222, ejabberd_c2s, [ + %% If you want dual stack, you have to clone this entire config stanza + %% and change the bind to "::" + { {5222, "0.0.0.0"}, ejabberd_c2s, [ %% %% If TLS is compiled in and you installed a SSL @@ -246,7 +248,9 @@ %% {max_stanza_size, 65536} %% ]}, - { 5269, ejabberd_s2s_in, [ + %% If you want dual stack, you have to clone this entire config stanza + %% and change the bind to "::" + { {5269, "0.0.0.0"}, ejabberd_s2s_in, [ {shaper, s2s_shaper}, {max_stanza_size, 131072}, {protocol_options, ["no_sslv3"]} diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx index 4da9918ca..7f48b614b 100644 --- a/installation/pleroma.nginx +++ b/installation/pleroma.nginx @@ -70,6 +70,7 @@ server { proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; proxy_set_header Host $http_host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; # this is explicitly IPv4 since Pleroma.Web.Endpoint binds on IPv4 only # and `localhost.` resolves to [::0] on some systems: see issue #930 |