From ca0e40d0dda5550e9e49137a3e3d023805de096a Mon Sep 17 00:00:00 2001
From: Tobias Reisinger <tobias@msrg.cc>
Date: Sun, 11 Feb 2024 21:37:10 +0100
Subject: [PATCH] Update vikunja to use unified image

---
 roles/vikunja/vars/main.yml | 29 +++++------------------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/roles/vikunja/vars/main.yml b/roles/vikunja/vars/main.yml
index 2f67aea..66c7771 100644
--- a/roles/vikunja/vars/main.yml
+++ b/roles/vikunja/vars/main.yml
@@ -2,17 +2,7 @@
 vikunja_svc:
   domain: todo.serguzim.me
   name: vikunja
-  port: 80
-  caddy_extra: |
-    handle /api/* {
-      reverse_proxy vikunja-api:3456
-    }
-    handle /.well-known/* {
-      reverse_proxy vikunja-api:3456
-    }
-    handle /dav/* {
-      reverse_proxy vikunja-api:3456
-    }
+  port: 3456
   db:
     host: "{{ postgres.host }}"
     port: "{{ postgres.port }}"
@@ -60,19 +50,10 @@ vikunja_yml:
 
 vikunja_compose:
   watchtower: true
-  image: vikunja/frontend
+  image: vikunja/vikunja
+  volumes:
+    - data:/app/vikunja/files
+    - ./config.yml:/app/vikunja/config.yml
   file:
-    services:
-      api:
-        image: vikunja/api
-        restart: always
-        volumes:
-          - data:/app/vikunja/files
-          - ./config.yml:/app/vikunja/config.yml
-        networks:
-          default:
-          apps:
-            aliases:
-              - "{{ svc.name }}-api"
     volumes:
       data: