Updated vilumes to support spaces.

defaults/main.yml

@@ -32,7 +32,11 @@ radarr_image_version: 'latest'
 radarr_host_port: 7878
 
 radarr_config_volume: '{{ arrs_configuration_volume }}/radarr'
-radarr_series_volume: '/mnt/videos/Movies'
+radarr_upload_volume: '/mnt/videos/Movies'
+radarr_library_volumes: 
+  - {path: '/mnt/video/Gold', alias: 'gold' }
+  - {path: '/mnt/video/Current', alias: 'current' }
+  - {path: '/mnt/video/Temporary', alias: 'temporary' }
 
 # Sonarr
 #
@@ -40,15 +44,19 @@ sonarr_image_version: 'latest'
 sonarr_host_port: 8989
 
 sonarr_config_volume: '{{ arrs_configuration_volume }}/sonarr'
-sonarr_series_volume: '/mnt/videos/Series'
+sonarr_upload_volume: '/mnt/videos/Series'
+sonarr_library_volumes: 
+  - {path: '/mnt/tv/Series', alias: 'series' }
+  - {path: '/mnt/tv/Animation', alias: 'animation' }
+  - {path: '/mnt/tv/SciFi', alias: 'scifi' }
 
 # Lidarr
 lidarr_image_version: 'latest'
 lidarr_host_port: 8686
 
 lidarr_config_volume: '{{ arrs_configuration_volume }}/lidarr'
-lidarr_music_upload_volume: '/mnt/music/Reference'
-lidarr_music_volumes: 
+lidarr_upload_volume: '/mnt/music/Reference'
+lidarr_library_volumes: 
   - {path: '/mnt/music/Sonos', alias: 'sonos' }
   - {path: '/mnt/music/Audiophile', alias: 'audiophile' }
   - {path: '/mnt/music/Raw', alias: 'raw' }

tasks/main.yml

@@ -1,18 +1,46 @@
 ---
 # tasks file for arrs
-- name: Set up directories
+- name: Set up main directory
   ansible.builtin.file:
     state: directory
     path: "{{ item }}"
     owner: "{{ ansible_effective_user_id }}"
     group: "{{ ansible_effective_group_id }}"
     mode: "0750"
+  with_items:
+    - "{{ arrs_setup_path }}"
+  tags:
+    - configuration
+  become: true
+
+- name: Set up config directories
+  ansible.builtin.file:
+    state: directory
+    path: "{{ item }}"
+    owner: "{% if arrs_uid %}{{ arrs_uid }}{% else %}{{ ansible_effective_user_id }}{%endif%}"
+    group: "{% if arrs_gid %}{{ arrs_gid }}{% else %}{{ ansible_effective_group_id }}{%endif%}"
+    mode: "0750"
   with_items:
     - "{{ deluge_config_volume }}"
+    - "{{ radarr_config_volume }}"
     - "{{ sonarr_config_volume }}"
     - "{{ lidarr_config_volume }}"
     - "{{ jackett_config_volume }}"
-    - "{{ arrs_setup_path }}"
+  tags:
+    - configuration
+  become: true
+
+- name: Set up upload directories
+  ansible.builtin.file:
+    state: directory
+    path: "{{ item }}"
+    owner: "{% if arrs_uid %}{{ arrs_uid }}{% else %}{{ ansible_effective_user_id }}{%endif%}"
+    group: "{% if arrs_gid %}{{ arrs_gid }}{% else %}{{ ansible_effective_group_id }}{%endif%}"
+    mode: "0750"
+  with_items:
+    - "{{ radarr_upload_volume }}"
+    - "{{ sonarr_upload_volume }}"
+    - "{{ lidarr_upload_volume }}"
   tags:
     - configuration
   become: true
@@ -25,6 +53,7 @@
   loop:
     - "docker-compose.yml"
     - "env.deluge.conf"
+    - "env.radarr.conf"
     - "env.sonarr.conf"
     - "env.lidarr.conf"
     - "env.jackett.conf"

templates/docker-compose.yml.j2

@@ -5,10 +5,10 @@ services:
     image: "lscr.io/linuxserver/deluge:{{ deluge_image_version }}"
     restart: unless-stopped
     env_file:
-      - {{ arrs_setup_path }}/env.deluge.conf
+      - "{{ arrs_setup_path }}/env.deluge.conf"
     volumes:
-      - {{ deluge_config_volume }}:/config
-      - {{ torrent_downloads_volume }}:/downloads
+      - "{{ deluge_config_volume }}:/config"
+      - "{{ torrent_downloads_volume }}:/downloads"
     ports:
       - {{ deluge_admin_port }}:8112
       - {{ deluge_host_port }}:6881
@@ -17,15 +17,18 @@ services:
       - arrs
 {% endif %}
 {% if radarr_enabled %}
-  sonarr:
+  radarr:
     image: "lscr.io/linuxserver/radarr:{{ radarr_image_version }}"
     restart: unless-stopped
     env_file:
-      - {{ arrs_setup_path }}/env.radarr.conf
+      - "{{ arrs_setup_path }}/env.radarr.conf"
     volumes:
-      - {{ radarr_config_volume }}:/config
-      - {{ radarr_series_volume }}:/movies
-      - {{ torrent_downloads_volume }}:/downloads
+      - "{{ radarr_config_volume }}:/config"
+      - "{{ torrent_downloads_volume }}:/downloads"
+      - "{{ radarr_upload_volume }}:/movies"
+{% for item in radarr_library_volumes %}
+      - "{{ item.path }}:/library/{{ item.alias }}"
+{% endfor %}
     ports:
       - {{ radarr_host_port }}:7878
     networks:
@@ -36,11 +39,14 @@ services:
     image: "lscr.io/linuxserver/sonarr:{{ sonarr_image_version }}"
     restart: unless-stopped
     env_file:
-      - {{ arrs_setup_path }}/env.sonarr.conf
+      - "{{ arrs_setup_path }}/env.sonarr.conf"
     volumes:
-      - {{ sonarr_config_volume }}:/config
-      - {{ sonarr_series_volume }}:/tv
-      - {{ torrent_downloads_volume }}:/downloads
+      - "{{ sonarr_config_volume }}:/config"
+      - "{{ torrent_downloads_volume }}:/downloads"
+      - "{{ sonarr_upload_volume }}:/tv"
+{% for item in sonarr_library_volumes %}
+      - "{{ item.path }}:/library/{{ item.alias }}"
+{% endfor %}
     ports:
       - {{ sonarr_host_port }}:8989
     networks:
@@ -51,12 +57,13 @@ services:
     image: "lscr.io/linuxserver/lidarr:{{ lidarr_image_version }}"
     restart: unless-stopped
     env_file:
-      - {{ arrs_setup_path }}/env.sonarr.conf
+      - "{{ arrs_setup_path }}/env.sonarr.conf"
     volumes:
-      - {{ lidarr_config_volume }}:/config
-      - {{ torrent_downloads_volume }}:/downloads
-{% for item in lidarr_music_volumes %}
-      - {{ item.path }}:/music/{{ item.alias }}
+      - "{{ lidarr_config_volume }}:/config"
+      - "{{ torrent_downloads_volume }}:/downloads"
+      - "{{ lidarr_upload_volume }}:/music"
+{% for item in lidarr_library_volumes %}
+      - "{{ item.path }}:/library/{{ item.alias }}"
 {% endfor %}
     ports:
       - {{ lidarr_host_port }}:8686
@@ -68,7 +75,7 @@ services:
     image: "lscr.io/linuxserver/jackett:{{ jackett_image_version }}"
     restart: unless-stopped
     env_file:
-      - {{ arrs_setup_path }}/env.jackett.conf
+      - "{{ arrs_setup_path }}/env.jackett.conf"
     volumes:
       - {{ jackett_config_volume }}:/config
       - {{ torrent_downloads_volume }}:/downloads