christianlight/tutor
6
0
Fork 0
mirror of https://github.com/ChristianLight/tutor.git synced 2025-01-07 07:54:03 +00:00
Code Issues Releases Activity

fix: https is ignored with proxy is enabled

Browse Source 
When ENABLE_WEB_PROXY=false, Caddy was overriding the X-Forwarded-*
headers. This is a change that was introduced in 2.5.0. We upgrade to
2.6.3 to use the new global "trusted_proxies" directive.

https://github.com/caddyserver/caddy/releases/tag/v2.6.3
https://github.com/caddyserver/caddy/releases/tag/v2.5.0
This commit is contained in:
Régis Behmo 2023-02-09 20:30:31 +01:00
parent bda4e0a71c
commit 2381be6921
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tutor/templates/apps/caddy/Caddyfile
View File

@ -1,5 +1,14 @@
# Global configuration # Global configuration
{ {
{% if not ENABLE_WEB_PROXY %}
# Enable proxying from all servers by default. Otherwise, X-Forwarded-* headers will
# be overwritten.
# https://caddyserver.com/docs/caddyfile/directives/reverse_proxy#defaults
servers {
trusted_proxies static 0.0.0.0/0 ::/0
}
{% endif %}
{{ patch("caddyfile-global")|indent(4) }} {{ patch("caddyfile-global")|indent(4) }}
} }

2
tutor/templates/config/defaults.yml
View File

@ -12,7 +12,7 @@ DOCKER_COMPOSE_VERSION: "3.7"
DOCKER_REGISTRY: "docker.io/" DOCKER_REGISTRY: "docker.io/"
DOCKER_IMAGE_OPENEDX: "{{ DOCKER_REGISTRY }}overhangio/openedx:{{ TUTOR_VERSION }}" DOCKER_IMAGE_OPENEDX: "{{ DOCKER_REGISTRY }}overhangio/openedx:{{ TUTOR_VERSION }}"
DOCKER_IMAGE_OPENEDX_DEV: "openedx-dev:{{ TUTOR_VERSION }}" DOCKER_IMAGE_OPENEDX_DEV: "openedx-dev:{{ TUTOR_VERSION }}"
DOCKER_IMAGE_CADDY: "docker.io/caddy:2.6.2" DOCKER_IMAGE_CADDY: "docker.io/caddy:2.6.3"
DOCKER_IMAGE_ELASTICSEARCH: "docker.io/elasticsearch:7.10.1" DOCKER_IMAGE_ELASTICSEARCH: "docker.io/elasticsearch:7.10.1"
DOCKER_IMAGE_MONGODB: "docker.io/mongo:4.2.17" DOCKER_IMAGE_MONGODB: "docker.io/mongo:4.2.17"
DOCKER_IMAGE_MYSQL: "docker.io/mysql:5.7.35" DOCKER_IMAGE_MYSQL: "docker.io/mysql:5.7.35"