Merge branch 'sonarr-radarr-transmission-emby' into 'master'

Tighter integration between transmission/sonaar/radarr/emby

See merge request !43

docs/software/radarr-sonarr.md

@@ -7,27 +7,53 @@
 To make either Sonarr or Radarr work, you need to configure an
 Indexer and a Downlad Client.
 
-The Indexer will be [Jackett](/software/jackett.md). Configure
-Jackett first, once that is done, in either Sonarr or Radarr, go
+### Indexer: Jackett
+
+The Download Client will be [Jackett](/software/jackett.md), you should make sure 
+that you have it installed and configured to follow these instructions.
+Then, in Sonarr (resp. Radarr), go
 to `Settings` then the `Indexers` tab, and click the Plus button.
 Select the `Custom` button undernear `Torznab` and enter
 `Jackett` for the name, for the URL enter `http://jackett:9117/api/v2.0/indexers/all/results/torznab/`
 and for the API Key, enter the API key that Jackett displays
-on it's Dashboard.
+on its Dashboard.
+
+### Download client: Transmission
 
-Next go to the `Download Client` tab, toggle the `Advanced Settings`
+The Download Client will be [Transmission](/software/transmission.md), you should make sure 
+that you have it installed and configured to follow these instructions.
+Then, in Sonarr (resp. Radarr), go
+to the `Download Client` tab, toggle the `Advanced Settings`
 toggle in the top right to `Shown`, then click the Plus button,
-select `Transmission`. Enter `transmission` for host,
+select `Transmission`. In the form that popped up, enter `transmission` for host,
 `9091` for port, and your transmission username and password in
-their respective fields. In Sonarr, enter `/tv` under `Directory`
-and in Radarr enter `/movies`. This points to the same folders
-[Emby](/software/emby.md) reads from, so they should be automatically
-detected by Emby if you set this up correctly.
+their respective fields.
+Indicate the following value for the `Directory` field:
+
+* In Sonarr, enter `/data/complete/tv`
+* In Radarr, enter `/data/complete/movies`
+
+Click `Save` to close the modal window. Back in the `Advanced settings` screen,
+add a "**Remote Path Mappings**" with the following values:
+* Host: `transmission`
+* Local Path:  `/downloads`
+* (Radarr) Remote Path: `/data/complete/movies`
+* (Sonarr) Remote Path: `/data/complete/tv`
+
+## Usage
+
+We recommend that you make sure you point Radarr (resp. Sonarr)
+to `/movies` (resp. `/tv`) when you add a movie (resp. TV show).
+
 
 Now if you add some content, either a movie to Radarr or
 a TV series to Sonarr, they will automatically be searched
 and downloaded according to your settings.
 
+> **Note**: These configuration steps MUST be followed
+> for **both** Sonarr and Radarr. If you use both of them, make sure
+> to apply the above in both software.
+
 ## Access
 
 Sonarr available at [https://sonarr.{{ domain }}/](https://sonarr.{{ domain }}/) or [http://sonarr.{{ domain }}/](http://sonarr.{{ domain }}/)
@@ -36,4 +62,4 @@ It is also available via Tor at [http://sonarr.{{ tor_domain }}/](http://sonarr.
 
 Radarr available at [https://radarr.{{ domain }}/](https://radarr.{{ domain }}/) or [http://radarr.{{ domain }}/](http://radarr.{{ domain }}/)
 
-It is also available via Tor at [http://radarr.{{ tor_domain }}/](http://radarr.{{ tor_domain }}/)
\ No newline at end of file
+It is also available via Tor at [http://radarr.{{ tor_domain }}/](http://radarr.{{ tor_domain }}/)

roles/radarr/templates/docker-compose.radarr.yml.j2

@@ -21,7 +21,7 @@ services:
       - /etc/localtime:/etc/localtime:ro
       - /var/homelabos/radarr/config:/config
       - /mnt/nas/Movies:/movies
-      - /mnt/nas/Downloads/completed:/downloads
+      - /mnt/nas/Downloads/complete/movies:/downloads
     labels:
       - "traefik.enable=true"
       - "traefik.docker.network=homelabos_traefik"

roles/sonarr/templates/docker-compose.sonarr.yml.j2

@@ -21,7 +21,7 @@ services:
       - /etc/localtime:/etc/localtime:ro
       - /var/homelabos/sonarr/config:/config
       - /mnt/nas/TV:/tv
-      - /var/homelabos/sonarr/downloads:/downloads
+      - /mnt/nas/Downloads/complete/tv:/downloads
     labels:
       - "traefik.enable=true"
       - "traefik.docker.network=homelabos_traefik"

roles/transmission/templates/docker-compose.transmission.yml.j2

@@ -27,8 +27,6 @@ services:
       - /etc/localtime:/etc/localtime:ro
       - /mnt/nas/Downloads:/data
       - /mnt/nas/Downloads/watch:/data/watch
-      - /mnt/nas/Movies:/movies
-      - /mnt/nas/TV:/tv
     environment:
       - OPENVPN_PROVIDER={{ openvpn_provider }}
       - OPENVPN_USERNAME={{ openvpn_username }}