From 1df1c2c97076bf50d9a5ffb35f6bb0ecf8689421 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Tue, 4 Apr 2023 01:15:18 +0300
Subject: [PATCH] Add collabora to caddy

---
 docker/caddy/Caddyfile               |  7 ++++++-
 docker/nextcloud/docker-compose.toml | 12 ------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile
index 43315044..64475793 100644
--- a/docker/caddy/Caddyfile
+++ b/docker/caddy/Caddyfile
@@ -116,7 +116,7 @@ korhonen.cc, *.korhonen.cc {
 			# Tells nextcloud to remove /index.php from URLs in links
 			env front_controller_active true
 		}
-		file_server browse
+		file_server
 	}
 
 	@tvheadend host tvheadend.korhonen.cc
@@ -124,6 +124,11 @@ korhonen.cc, *.korhonen.cc {
 		reverse_proxy tvheadend:9981
 	}
 
+	@collabora host collabora.korhonen.cc
+	handle @collabora {
+		reverse_proxy collabora:9980
+	}
+
 	# Fallback for unhandled domains
 	handle {
 		redir https://korhonen.cc/404.html 301
diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml
index c6f588c8..1bf978cc 100644
--- a/docker/nextcloud/docker-compose.toml
+++ b/docker/nextcloud/docker-compose.toml
@@ -69,18 +69,6 @@ environment = [
   'extra_params=--o:ssl.enable=false --o:ssl.termination=true',
 ]
 networks = ["proxy"]
-labels = [
-  "traefik.enable=true",
-  "traefik.http.routers.collabora-redirect.entrypoints=http",
-  "traefik.http.routers.collabora-redirect.rule=Host(`collabora.korhonen.cc`)",
-  "traefik.http.routers.collabora-redirect.middlewares=http2https@file",
-  "traefik.http.routers.collabora.entrypoints=https",
-  "traefik.http.routers.collabora.rule=Host(`collabora.korhonen.cc`)",
-  "traefik.http.routers.collabora.service=collabora",
-  "traefik.http.routers.collabora.middlewares=secHeaders@file,compress@file",
-  "traefik.docker.network=proxy",
-  "traefik.http.services.collabora.loadbalancer.server.port=9980",
-]
 
 [networks.nextcloud]
 external = false