From 58c48261e7c6241a9dc1ee89f94ef3f5322e570b Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Mon, 12 Feb 2024 14:12:17 +0000
Subject: [PATCH] Consolidate vikunja container

---
 .../roles/vikunja/files/docker-compose.yml    | 22 ++++---------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/ansible/roles/vikunja/files/docker-compose.yml b/ansible/roles/vikunja/files/docker-compose.yml
index efcf0d3..d2f201a 100644
--- a/ansible/roles/vikunja/files/docker-compose.yml
+++ b/ansible/roles/vikunja/files/docker-compose.yml
@@ -1,8 +1,8 @@
 version: "2.3"
 
 services:
-  api:
-    image: vikunja/api:latest
+  vikunja:
+    image: vikunja/vikunja:latest
     restart: unless-stopped
     environment:
       - VIKUNJA_DATABASE_HOST=db
@@ -23,13 +23,13 @@ services:
       - VIKUNJA_MAILER_USERNAME={{ vault_smtp_username }}
       - VIKUNJA_MAILER_PASSWORD={{ vault_smtp_password }}
       - VIKUNJA_MAILER_HOST=smtp.eu.mailgun.org
+      - VIKUNJA_SENTRY_DSN=
       - TZ={{ timezone }}
       - PUID={{ docker_user.id }}
       - PGID={{ docker_user.id }}
     labels:
       - traefik.enable=true
-      # yamllint disable-line rule:line-length
-      - traefik.http.routers.vikunja-api.rule=Host(`tasks.jakehoward.tech`) && (PathPrefix(`/api/v1`) || PathPrefix(`/dav/`) || PathPrefix(`/.well-known/`) || Path(`/health`))
+      - traefik.http.routers.vikunja.rule=Host(`tasks.jakehoward.tech`)
     volumes:
       - /mnt/tank/app-data/vikunja/files:/app/vikunja/files
     depends_on:
@@ -39,20 +39,6 @@ services:
       - default
       - traefik
 
-  frontend:
-    image: vikunja/frontend:latest
-    restart: unless-stopped
-    labels:
-      - traefik.enable=true
-      - traefik.http.routers.vikunja-frontend.rule=Host(`tasks.jakehoward.tech`)
-    environment:
-      - VIKUNJA_SENTRY_DSN=
-    networks:
-      - default
-      - traefik
-    depends_on:
-      - api
-
   db:
     image: postgres:14-alpine
     restart: unless-stopped