From 5f663b419eb4e671fff52909a53683ce826fdcef Mon Sep 17 00:00:00 2001 From: Hawk Date: Sun, 22 Oct 2023 19:02:37 +0100 Subject: [PATCH 1/2] Update Caddy Instructions Provide Caddy 2 Caddyfile. Update Caddy Documenation Link. Clarify PublicPath settings. --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ab7a2556b7..dcceecf82b 100644 --- a/README.md +++ b/README.md @@ -401,14 +401,15 @@ Once complete, test that your configuration worked by visiting your proxy site f #### Caddy (Reccommended for Linux, or those unfamilar with configuring NGINX or Apache) 1. Setup a basic website configuration. Instructions on how to do so are out of scope. -2. In your Caddyfile, under a server entry, add the following (replace 8080 with the port TGS is hosted on): +2. In your Caddyfile, under a server entry, add the following (replace 5000 with the port TGS is hosted on): ``` -proxy /tgs localhost:8080 { - transparent +https://your.site.here { + reverse_proxy localhost:5000 } ``` +3. For this setup, your PublicPath needs to be blank. If you have a path in PublicPath, it needs to be in "reverse_proxy PublicPathHere localhost:5000". -See https://caddyserver.com/docs/proxy +See https://caddyserver.com/docs/caddyfile/directives/reverse_proxy #### NGINX (Reccommended for Linux) From a97001231ff6b1606b54adc16f4ee19a01e04069 Mon Sep 17 00:00:00 2001 From: Hawk-v3 Date: Sun, 22 Oct 2023 19:32:55 +0100 Subject: [PATCH 2/2] Update README.md Accept correction for definition of PublicPath Co-authored-by: Jordan Dominion --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dcceecf82b..64221f5028 100644 --- a/README.md +++ b/README.md @@ -407,7 +407,7 @@ https://your.site.here { reverse_proxy localhost:5000 } ``` -3. For this setup, your PublicPath needs to be blank. If you have a path in PublicPath, it needs to be in "reverse_proxy PublicPathHere localhost:5000". +3. For this setup, your configuration's `ControlPanel:PublicPath` needs to be blank. If you have a path in `PublicPath`, it needs to be in "reverse_proxy PublicPathHere localhost:5000". See https://caddyserver.com/docs/caddyfile/directives/reverse_proxy