Move MediaCover directories and DB files

HadrienPatte · Apr 27, 2024 · 86abd9b · 86abd9b
1 parent 7914a1e
commit 86abd9b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/roles/mediaserver/defaults/main.yml b/roles/mediaserver/defaults/main.yml
@@ -5,28 +5,28 @@ containers:
     port: 7878
     volumes:
       - /data/state/radarr/config.xml:/config/config.xml
-      - /data/radarr.db:/config/radarr.db
-      - /data/radarr.db-wal:/config/radarr.db-wal
-      - /cache/radarr:/config/MediaCover
+      - /data/state/radarr/radarr.db:/config/radarr.db
+      - /data/state/radarr/radarr.db-wal:/config/radarr.db-wal
+      - /data/state/radarr/MediaCover:/config/MediaCover
       - /data:/data
 
   sonarr:
     image: ghcr.io/hadrienpatte/sonarr
     port: 8989
     volumes:
       - /data/state/sonarr/config.xml:/config/config.xml
-      - /data/sonarr.db:/config/sonarr.db
-      - /data/sonarr.db-wal:/config/sonarr.db-wal
-      - /cache/sonarr:/config/MediaCover
+      - /data/state/sonarr/sonarr.db:/config/sonarr.db
+      - /data/state/sonarr/sonarr.db-wal:/config/sonarr.db-wal
+      - /data/state/sonarr/MediaCover:/config/MediaCover
       - /data:/data
 
   prowlarr:
     image: ghcr.io/hadrienpatte/prowlarr
     port: 9696
     volumes:
       - /data/state/prowlarr/config.xml:/config/config.xml
-      - /data/prowlarr.db:/config/prowlarr.db
-      - /data/prowlarr.db-wal:/config/prowlarr.db-wal
+      - /data/state/prowlarr/prowlarr.db:/config/prowlarr.db
+      - /data/state/prowlarr/prowlarr.db-wal:/config/prowlarr.db-wal
 
   qbittorrent:
     image: ghcr.io/onedr0p/qbittorrent

diff --git a/roles/mediaserver/tasks/arr.yml b/roles/mediaserver/tasks/arr.yml
@@ -1,12 +1,17 @@
 ---
-- name: Create config directory for {{ item.key }}
+- name: Create config directories for {{ item.key }}
   become: true
   ansible.builtin.file:
-    path: /data/state/{{ item.key }}
+    path: "{{ directory }}"
     state: directory
     mode: 0755
     owner: "{{ nonroot_uid }}"
     group: "{{ nonroot_gid }}"
+  with_items:
+    - /data/state/{{ item.key }}
+    - /data/state/{{ item.key }}/MediaCover
+  loop_control:
+    loop_var: directory
 
 - name: Check if config file exists for {{ item.key }}
   ansible.builtin.stat:

diff --git a/roles/mediaserver/tasks/main.yml b/roles/mediaserver/tasks/main.yml
@@ -75,7 +75,7 @@
     driver: bridge
     state: present
 
-- name: Create data and cache directories
+- name: Create data directories
   become: true
   ansible.builtin.file:
     path: "{{ item }}"
@@ -89,9 +89,6 @@
     - /data/media
     - /data/media/movies
     - /data/media/tv
-    - /cache
-    - /cache/sonarr
-    - /cache/radarr
     - /etc/jellyfin
     - /etc/jellyfin/config