From 9d2f0e802a1d7efb984ae869f72468a53771db1c Mon Sep 17 00:00:00 2001 From: comeUpWithItLater Date: Sat, 14 Sep 2024 01:43:57 +0800 Subject: [PATCH 1/3] Update examples/reverse-proxies/caddy2-in-container/README.md Co-authored-by: Slavi Pantaleev --- examples/reverse-proxies/caddy2-in-container/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/reverse-proxies/caddy2-in-container/README.md b/examples/reverse-proxies/caddy2-in-container/README.md index 155f3e650..5d3863b09 100644 --- a/examples/reverse-proxies/caddy2-in-container/README.md +++ b/examples/reverse-proxies/caddy2-in-container/README.md @@ -2,7 +2,7 @@ This directory contains a sample config that shows you how to front the integrated [Traefik](https://traefik.io/) reverse-proxy webserver with your own container-ed [Caddy](https://caddyserver.com/) reverse-proxy. If you have a server with a Caddy container already serving several applications. And you want to install Matrix on it, but you don't want to break the existing traffic routing (so that the existing applications keep running smoothly). Then this guide is helpful. -Ps. If you have a `apt-get ` or `yum` installed caddy instead of container-ed Caddy, please see [caddy2](../caddy2/README.md). +Note: if you're running Caddy on the host itself (not in a container), refer to the [caddy2](../caddy2/README.md) example instead. ## Prerequisite configuration From 2c9e609b16c10af4fc948e930431478aed7250f0 Mon Sep 17 00:00:00 2001 From: comeUpWithItLater Date: Sat, 14 Sep 2024 01:50:56 +0800 Subject: [PATCH 2/3] Update examples/reverse-proxies/caddy2-in-container/README.md Co-authored-by: Slavi Pantaleev --- examples/reverse-proxies/caddy2-in-container/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/reverse-proxies/caddy2-in-container/README.md b/examples/reverse-proxies/caddy2-in-container/README.md index 5d3863b09..1682e84f6 100644 --- a/examples/reverse-proxies/caddy2-in-container/README.md +++ b/examples/reverse-proxies/caddy2-in-container/README.md @@ -17,4 +17,4 @@ And adjust the `docker-compose.yaml` of Caddy's. See [examples/reverse-proxies/c You can either just use the [Caddyfile](Caddyfile) directly or append its content to your own Caddyfile. In both cases make sure to replace all the `example.tld` domains with your own domain. -This example does not include additional services like element, but you should be able copy the first block and replace the matrix subdomain with the additional services subdomain. I have not tested this though. +This example does not include additional services like Element, but you should be able copy the first block and replace the `matrix.` subdomain with the subdomain of the some other service (e.g. `element.`). From 7cf6cae12d64b0ec19694ec80e8cc396a938221c Mon Sep 17 00:00:00 2001 From: comeUpWithItLater Date: Sat, 14 Sep 2024 01:53:18 +0800 Subject: [PATCH 3/3] Update examples/reverse-proxies/caddy2-in-container/README.md Co-authored-by: Slavi Pantaleev --- examples/reverse-proxies/caddy2-in-container/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/reverse-proxies/caddy2-in-container/README.md b/examples/reverse-proxies/caddy2-in-container/README.md index 1682e84f6..e6ed1287d 100644 --- a/examples/reverse-proxies/caddy2-in-container/README.md +++ b/examples/reverse-proxies/caddy2-in-container/README.md @@ -1,6 +1,6 @@ # Caddy reverse-proxy fronting the playbook's integrated Traefik reverse-proxy -This directory contains a sample config that shows you how to front the integrated [Traefik](https://traefik.io/) reverse-proxy webserver with your own container-ed [Caddy](https://caddyserver.com/) reverse-proxy. If you have a server with a Caddy container already serving several applications. And you want to install Matrix on it, but you don't want to break the existing traffic routing (so that the existing applications keep running smoothly). Then this guide is helpful. +This directory contains a sample config that shows you how to front the integrated [Traefik](https://traefik.io/) reverse-proxy webserver with your own **containerized** [Caddy](https://caddyserver.com/) reverse-proxy. If you have a server with a Caddy container already serving several applications and you want to install Matrix on it (with no changes to existing traffic routing), then this guide is for you. Note: if you're running Caddy on the host itself (not in a container), refer to the [caddy2](../caddy2/README.md) example instead.