From 4c878661e8a6aa29d839a48bf56ee4b946df7a2a Mon Sep 17 00:00:00 2001
From: Alex Frantz <alex@alexav.gg>
Date: Fri, 21 Nov 2025 21:33:45 -0500
Subject: [PATCH] migrate owncloud

---
 tasks/jellyfin.yml | 39 ---------------------------
 tasks/owncloud.yml | 66 ++++++++++++++++++++--------------------------
 2 files changed, 29 insertions(+), 76 deletions(-)
 delete mode 100644 tasks/jellyfin.yml

diff --git a/tasks/jellyfin.yml b/tasks/jellyfin.yml
deleted file mode 100644
index 8cccd56..0000000
--- a/tasks/jellyfin.yml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-- name: Create folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/jellyfin"
-
-- name: Pull latest Jellyfin Docker Image
-  docker_image:
-    name: lscr.io/linuxserver/jellyfin
-    tag: latest
-    source: pull
-
-- name: Create Jellyfin Docker Container
-  docker_container:
-    name: jellyfin
-    image: lscr.io/linuxserver/jellyfin:latest
-    restart_policy: unless-stopped
-    recreate: true
-    networks:
-      - name: homelab
-    published_ports:
-      - 8096:8096
-    volumes:
-      - "{{ data_dir }}/jellyfin:/config"
-      - "{{ JELLYFIN_TV_PATH }}:/data/tvshows"
-      - "{{ JELLYFIN_MOVIE_PATH }}:/data/movies"
-      - "{{ JELLYFIN_MUSIC_PATH }}:/data/music"
-    env:
-      PUID: "{{ PUID }}"
-      PGID: "{{ PGID }}"
-      TZ: "{{ TZ }}"
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.jf.rule: Host(`jf.fntz.net`)
-      traefik.http.routers.jf.entrypoints: webSecure
-      traefik.http.routers.jf.tls.certresolver: letsencrypt
-      traefik.http.services.jf.loadbalancer.server.port: "8096"
diff --git a/tasks/owncloud.yml b/tasks/owncloud.yml
index a0edb6e..1a16d09 100644
--- a/tasks/owncloud.yml
+++ b/tasks/owncloud.yml
@@ -1,30 +1,18 @@
 ---
-- name: Create folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/owncloud"
-    - "{{ data_dir }}/owncloud/data"
-    - "{{ data_dir }}/owncloud/db"
-    - "{{ data_dir }}/owncloud/redis"
-
-- name: Create Owncloud Docker Network
-  docker_network:
-    name: owncloud
-
-- name: Pull latest Owncloud Docker Image
-  docker_image:
-    name: owncloud/server
-    tag: "10.15"
-    source: pull
-
-- name: Create Owncloud DB Docker Container
-  docker_container:
-    name: oc_database
-    image: mariadb:latest
-    restart_policy: unless-stopped
-    recreate: true
+- name: Deploy Owncloud Database
+  include_role:
+    name: docker
+  vars:
+    name: owncloud_database
+    image:
+      name: mariadb
+      tag: latest
+    directories:
+      - "{{ data_dir }}/owncloud"
+      - "{{ data_dir }}/owncloud/data"
+      - "{{ data_dir }}/owncloud/db"
+      - "{{ data_dir }}/owncloud/redis"
+    network_name: "owncloud"
     networks:
       - name: owncloud
     volumes:
@@ -42,12 +30,14 @@
       timeout: 5s
       retries: 5
 
-- name: Create Owncloud Redis Container
-  docker_container:
-    name: oc_redis
-    image: redis:latest
-    restart_policy: unless-stopped
-    recreate: true
+- name: Deploy Owncloud Redis
+  include_role:
+    name: docker
+  vars:
+    name: owncloud_redis
+    image:
+      name: redis
+      tag: latest
     networks:
       - name: owncloud
     command: "--databases 1"
@@ -59,12 +49,14 @@
     volumes:
       - "{{ data_dir }}/owncloud/redis:/data"
 
-- name: Create Owncloud Docker Container
-  docker_container:
+- name: Deploy Owncloud
+  include_role:
+    name: docker
+  vars:
     name: owncloud
-    image: owncloud/server:10.15
-    restart_policy: unless-stopped
-    recreate: true
+    image:
+      name: owncloud/server
+      tag: 10.16
     networks:
       - name: "{{ docker_network_name }}"
       - name: owncloud