From d96ba3152433d605f1bb0dfd64c54c93de9b39cc Mon Sep 17 00:00:00 2001
From: Menno van Leeuwen <menno@vleeuwen.me>
Date: Mon, 17 Mar 2025 13:43:19 +0100
Subject: [PATCH] feat: remove Caddy and Seadoc service configurations from
 Seafile deployment

---
 .../servers/services/seafile/caddy.yml.j2     | 26 -------------------
 .../services/seafile/docker-compose.yml.j2    | 20 ++++++++++++--
 .../servers/services/seafile/seadoc.yml.j2    | 24 -----------------
 .../servers/services/seafile/seafile.yml      |  3 +--
 4 files changed, 19 insertions(+), 54 deletions(-)
 delete mode 100644 config/ansible/tasks/servers/services/seafile/caddy.yml.j2
 delete mode 100644 config/ansible/tasks/servers/services/seafile/seadoc.yml.j2

diff --git a/config/ansible/tasks/servers/services/seafile/caddy.yml.j2 b/config/ansible/tasks/servers/services/seafile/caddy.yml.j2
deleted file mode 100644
index 2321ed1..0000000
--- a/config/ansible/tasks/servers/services/seafile/caddy.yml.j2
+++ /dev/null
@@ -1,26 +0,0 @@
-services:
-
-  caddy:
-    image: ${SEAFILE_CADDY_IMAGE:-lucaslorentz/caddy-docker-proxy:2.9-alpine}
-    restart: unless-stopped
-    container_name: seafile-caddy
-    ports:
-      - 80:80
-      - 443:443
-    environment:
-      - CADDY_INGRESS_NETWORKS=seafile-net
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - ${SEAFILE_CADDY_VOLUME:-/opt/seafile-caddy}:/data/caddy
-    networks:
-      - seafile-net
-    healthcheck:
-      test: ["CMD-SHELL", "curl --fail http://localhost:2019/metrics || exit 1"]
-      start_period: 20s
-      interval: 20s
-      timeout: 5s
-      retries: 3
-
-networks:
-  seafile-net:
-    name: seafile-net
diff --git a/config/ansible/tasks/servers/services/seafile/docker-compose.yml.j2 b/config/ansible/tasks/servers/services/seafile/docker-compose.yml.j2
index c3b7a00..0f465e9 100644
--- a/config/ansible/tasks/servers/services/seafile/docker-compose.yml.j2
+++ b/config/ansible/tasks/servers/services/seafile/docker-compose.yml.j2
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   db:
     image: ${SEAFILE_DB_IMAGE}
@@ -62,6 +60,24 @@ services:
       - seafile
     restart: unless-stopped
 
+  seadoc-server:
+    image: ${SEADOC_IMAGE}
+    container_name: seadoc-server
+    environment:
+      - DB_HOST=${SEAFILE_MYSQL_DB_HOST}
+      - DB_ROOT_PASSWD=${INIT_SEAFILE_MYSQL_ROOT_PASSWORD}
+      - TIME_ZONE=${TIME_ZONE}
+      - JWT_PRIVATE_KEY=${JWT_PRIVATE_KEY}
+    volumes:
+      - ${SEADOC_VOLUME}:/shared
+      - ${SEAFILE_VOLUME}:/shared/seafile
+    networks:
+      - seafile-net
+    depends_on:
+      - db
+      - seafile
+    restart: unless-stopped
+
 networks:
   seafile-net:
   caddy_default:
diff --git a/config/ansible/tasks/servers/services/seafile/seadoc.yml.j2 b/config/ansible/tasks/servers/services/seafile/seadoc.yml.j2
deleted file mode 100644
index 129d735..0000000
--- a/config/ansible/tasks/servers/services/seafile/seadoc.yml.j2
+++ /dev/null
@@ -1,24 +0,0 @@
-version: '3.8'
-
-services:
-  seadoc-server:
-    image: ${SEADOC_IMAGE}
-    container_name: seadoc-server
-    environment:
-      - DB_HOST=${SEAFILE_MYSQL_DB_HOST}
-      - DB_ROOT_PASSWD=${INIT_SEAFILE_MYSQL_ROOT_PASSWORD}
-      - TIME_ZONE=${TIME_ZONE}
-      - JWT_PRIVATE_KEY=${JWT_PRIVATE_KEY}
-    volumes:
-      - ${SEADOC_VOLUME}:/shared
-      - ${SEAFILE_VOLUME}:/shared/seafile
-    networks:
-      - seafile-net
-    depends_on:
-      - db
-      - seafile
-    restart: unless-stopped
-
-networks:
-  seafile-net:
-    name: seafile-net
diff --git a/config/ansible/tasks/servers/services/seafile/seafile.yml b/config/ansible/tasks/servers/services/seafile/seafile.yml
index 98aa783..fc5a781 100644
--- a/config/ansible/tasks/servers/services/seafile/seafile.yml
+++ b/config/ansible/tasks/servers/services/seafile/seafile.yml
@@ -58,7 +58,6 @@
         mode: "0644"
       loop:
         - docker-compose.yml.j2
-        - seadoc.yml.j2
         - .env.j2
       register: seafile_configs
 
@@ -70,7 +69,7 @@
         - connect_network.rc != 0
         - "'already exists' not in connect_network.stderr"
       when: seafile_configs.changed
-      
+
     - name: Stop Seafile service
       ansible.builtin.command: docker compose -f "{{ seafile_service_dir }}/docker-compose.yml" down --remove-orphans
       when: seafile_configs.changed