Skip to content

Commit

Permalink
trust the reverse proxy by default
Browse files Browse the repository at this point in the history
  • Loading branch information
@marcquark
marcquark committed Feb 15, 2021
1 parent 1434c37 commit fd3d48b
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion roles/matrix-etherpad/defaults/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,12 @@ matrix_etherpad_user_gid: '5001'
matrix_etherpad_container_http_host_bind_port: ''

# A list of extra arguments to pass to the container
matrix_etherpad_container_extra_arguments: []
#
# We assume that a reverse proxy is used and tell the container to trust it
# Details: https://github.com/ether/etherpad-lite/blob/develop/doc/docker.md
matrix_etherpad_container_extra_arguments: [
'--env TRUST_PROXY=true'
]

matrix_etherpad_public_endpoint: '/etherpad'

Expand Down

2 comments on commit fd3d48b

@pushytoxin
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did this really make any difference?

TRUST_PROXY only replaces the line in the config file if you use the .docker template, which we don't.
"trustProxy" is already set to true in our own template.

@spantaleev
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point! Reverted here: 8f7f45d

Please sign in to comment.