From b3fd40b359cfeb826699be06406c96d8ec867a70 Mon Sep 17 00:00:00 2001
From: Daniel Meiburg <key@dmeiburg.de>
Date: Wed, 17 Apr 2024 20:47:57 +0200
Subject: [PATCH] grist, authentik, nextcloud: change nginx to caddy

---
 authentik/docker-compose.yml |  2 +-
 grist/docker-compose.yml     | 13 ++++++-------
 nextcloud/docker-compose.yml | 11 +++++------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/authentik/docker-compose.yml b/authentik/docker-compose.yml
index 4cebfa2..086f2ae 100644
--- a/authentik/docker-compose.yml
+++ b/authentik/docker-compose.yml
@@ -86,4 +86,4 @@ volumes:
 networks:
   default:
     name: caddy
-    external: true
+    external
diff --git a/grist/docker-compose.yml b/grist/docker-compose.yml
index bf67f2b..3a5d1b6 100644
--- a/grist/docker-compose.yml
+++ b/grist/docker-compose.yml
@@ -8,9 +8,6 @@ services:
       - grist:/persist
       - certs:/certs
     environment:
-      VIRTUAL_HOST: grist.dmeiburg.de
-      LETSENCRYPT_EMAIL: ${EMAIL}
-      LETSENCRYPT_HOST: grist.dmeiburg.de
       APP_HOME_URL: https://grist.dmeiburg.de
       GRIST_SESSION_SECRET: ${SECRET}
       GRIST_SANDBOX_FLAVOR: gvisor
@@ -18,12 +15,14 @@ services:
       GRIST_OIDC_IDP_ISSUER: https://sso.dmeiburg.de/application/o/grist/.well-known/openid-configuration
       GRIST_OIDC_IDP_CLIENT_ID: ${OIDC_ID}
       GRIST_OIDC_IDP_CLIENT_SECRET: ${OIDC_SECRET}
-    expose: 
-        - 8484
+    labels: 
+      caddy: cloud.dmeiburg.de
+      caddy.reverse_proxy: "{{upstreams 8484}}"
+
 networks:
   default:
-      name: nginx-proxy
-      external: true
+    name: caddy
+    external
 
 volumes:
   grist:
diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
index fb09b05..f1f7f04 100644
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -15,8 +15,6 @@ services:
 
   app:
     image: nextcloud
-    expose:
-      - 80
     links:
       - db
     volumes:
@@ -24,14 +22,15 @@ services:
     hostname: cloud.dmeiburg.de
     restart: always
     environment:
-      VIRTUAL_HOST: cloud.dmeiburg.de
-      LETSENCRYPT_HOST: cloud.dmeiburg.de
       OVERWRITEPROTOCOL: https
       POSTGRES_HOST: db
     env_file: 
       - .env
+    labels: 
+      caddy: cloud.dmeiburg.de
+      caddy.reverse_proxy: "{{upstreams 80}}"
 
 networks:
   default:
-    name: nginx-proxy
-    external: true
+    name: caddy
+    external