From ab2a8ca4192d82fdeb4b79b3b1b93728a3ddc04b Mon Sep 17 00:00:00 2001 From: Oskar Hahn Date: Sat, 6 Feb 2021 11:47:38 +0100 Subject: [PATCH] Use https in dev mode --- caddy/Caddyfile | 2 +- caddy/Caddyfile.dev | 20 ++++++++++++++++++++ docker/docker-compose.dev.yml | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 caddy/Caddyfile.dev diff --git a/caddy/Caddyfile b/caddy/Caddyfile index aeb601dac..4122bbacf 100644 --- a/caddy/Caddyfile +++ b/caddy/Caddyfile @@ -5,7 +5,7 @@ :8000 -reverse_proxy /system/* http://autoupdate:8002 { +reverse_proxy /system/* autoupdate:8002 { flush_interval -1 } diff --git a/caddy/Caddyfile.dev b/caddy/Caddyfile.dev new file mode 100644 index 000000000..bdf5a139d --- /dev/null +++ b/caddy/Caddyfile.dev @@ -0,0 +1,20 @@ +{ + # Enable debug output + debug +} + +localhost:8000 + +reverse_proxy /system/* autoupdate:8002 { + flush_interval -1 +} + +@server { + path /apps/* + path /rest/* + path /server-version.txt + path /media/* +} +reverse_proxy @server server:8000 + +reverse_proxy client:4200 diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index 801cb31d9..970387e7e 100644 --- a/docker/docker-compose.dev.yml +++ b/docker/docker-compose.dev.yml @@ -48,7 +48,7 @@ services: caddy: image: caddy:2.3.0-alpine volumes: - - ../caddy/Caddyfile:/etc/caddy/Caddyfile + - ../caddy/Caddyfile.dev:/etc/caddy/Caddyfile depends_on: - client - server