Merge pull request #212 from animeai/fix-file-location-options

Fix file location options

group_vars/all.yml

@@ -610,8 +610,11 @@ miniflux_port: "8070"
 ###
 airsonic_available_externally: "false"
 airsonic_data_directory: "{{ docker_home }}/airsonic"
+airsonic_music_directory: "{{ music_root }}"
+airsonic_podcasts_directory: "{{ podcasts_root }}"
 airsonic_port: "4040"
 
+
 ###
 ### CloudCmd
 ###
@@ -676,6 +679,7 @@ mymediaforalexa_data_directory: "{{ docker_home }}/mymediaforalexa"
 ###
 jackett_available_externally: "false"
 jackett_data_directory: "{{ docker_home }}/jackett"
+jackett_torrents_root: "{{ torrents_root }}"
 jackett_port: "9117"
 
 ###
@@ -743,6 +747,7 @@ calibre_available_externally: "false"
 calibre_data_directory: "{{ docker_home }}/calibre"
 calibre_user_id: "0"
 calibre_group_id: "0"
+calibre_books_root: "{{ books_root }}"
 calibre_port: "8084"
 # To disable ebook conversion set calibre_ebook_conversion to "". To enable it set it to "linuxserver/calibre-web:calibre"
 calibre_ebook_conversion: "linuxserver/calibre-web:calibre"

tasks/airsonic.yml

@@ -16,8 +16,8 @@
     volumes:
       - "{{ airsonic_data_directory }}/data:/airsonic/data:rw"
       - "{{ airsonic_data_directory }}/playlists:/airsonic/playlists:rw"
-      - "{{ samba_shares_root }}/music:/airsonic/music:rw"
-      - "{{ samba_shares_root }}/podcasts:/airsonic/podcasts:rw"
+      - "{{ airsonic_music_directory }}:/airsonic/music:rw"
+      - "{{ airsonic_podcasts_directory }}:/airsonic/podcasts:rw"
     ports:
       - "{{ airsonic_port }}:4040"
     restart_policy: unless-stopped

tasks/calibre.yml

@@ -12,7 +12,7 @@
     pull: true
     volumes:
       - "{{ calibre_data_directory }}/config:/config"
-      - "{{ books_root }}:/books"
+      - "{{ calibre_books_root }}:/books"
     env:
       TZ: "{{ ansible_nas_timezone }}"
       PUID: "{{ calibre_user_id }}"

tasks/jackett.yml

@@ -13,7 +13,7 @@
     volumes:
       - "{{ jackett_data_directory }}:/config:rw"
       - "/etc/localtime:/etc/localtime:ro"
-      - "{{ torrents_root }}:/downloads"
+      - "{{ jackett_torrents_root }}:/downloads"
     ports:
       - "{{ jackett_port }}:9117"
     env: