Fix merge conflict

README.md

@@ -12,8 +12,9 @@ Ansible config and a bunch of Docker containers.
 * Any number of Samba shares or NFS exports for you to store your stuff
 * A BitTorrent client
 * A Usenet downloader
-* Various media management tools - Sonarr, Sickchill, CouchPotato, Radarr, Bazarr
-* Media streaming via Plex, Emby or Jellyfin
+
+* Various media management tools - Sonarr, Sickchill, CouchPotato, Radarr, Bazarr, Lidarr
+* Media streaming via Plex or Emby
 * Music streaming with Airsonic
 * An RSS newsfeed reader - Miniflux
 * A Dropbox replacement via Nextcloud
@@ -53,6 +54,7 @@ Ansible config and a bunch of Docker containers.
 * [Jackett](https://github.com/Jackett/Jackett) - API Support for your favorite torrent trackers
 * [Jellyfin](https://jellyfin.github.io) - The Free Software Media System
 * [Joomla](https://www.joomla.org/) - Open source content management system
+* [Lidarr](https://github.com/lidarr/Lidarr) - Music collection manager for Usenet and BitTorrent users
 * [MiniDlna](https://sourceforge.net/projects/minidlna/) - simple media server which is fully compliant with DLNA/UPnP-AV clients
 * [Miniflux](https://miniflux.app/) - An RSS news reader
 * [Mosquitto](https://mosquitto.org) - An open source MQTT broker

docs/applications/lidarr.md

@@ -0,0 +1,12 @@
+# Lidarr music collection manager
+
+Homepage: [https://lidarr.audio/](https://lidarr.audio/)
+
+
+Lidarr is a music collection manager for Usenet and BitTorrent users. It can monitor multiple RSS feeds for new tracks from your favorite artists and will grab, sort and rename them. It can also be configured to automatically upgrade the quality of files already downloaded when a better quality format becomes available.
+
+
+
+## Usage
+
+Set `lidarr_enabled: true` in your `group_vars/all.yml` file.

docs/configuration/application_ports.md

@@ -27,6 +27,7 @@ By default, applications can be found on the ports listed below.
 | Jackett         | 9117   |           |
 | Jellyfin        | 8896   | HTTP      |
 | Jellyfin        | 8928   | HTTPS     |
+| Lidarr          | 8686   |           |
 | MiniDLNA        | 8201   |           |
 | Miniflux        | 8070   |           |
 | Mosquitto       | 1883   | MQTT      |

group_vars/all.yml.dist

@@ -46,6 +46,7 @@ ombi_enabled: false
 # Music
 airsonic_enabled: false
 mymediaforalexa_enabled: false
+lidarr_enabled: false
 
 # News
 miniflux_enabled: false
@@ -446,6 +447,16 @@ bazarr_movies_directory: "{{ movies_root }}"
 bazarr_user_id: "0"
 bazarr_group_id: "0"
 
+###
+### lidarr
+###
+lidarr_available_externally: "false"
+lidarr_data_directory: "{{ docker_home }}/lidarr/config"
+lidarr_music_directory: "{{ music_root }}"
+lidarr_downloads_directory: "{{ downloads_root }}"
+lidarr_user_id: 0
+lidarr_group_id: 0
+
 
 ###
 ### Couchpotato

nas.yml

@@ -211,3 +211,7 @@
   - import_tasks: tasks/ombi.yml
     when: (ombi_enabled | default(False))
     tags: ombi
+    
+  - import_tasks: tasks/lidarr.yml
+    when: (lidarr_enabled | default(False))
+    tags: lidarr

tasks/lidarr.yml

@@ -0,0 +1,30 @@
+---
+- name: Create lidarr Directories
+  file:
+    path: "{{ item }}"
+    state: directory
+  with_items:
+    - "{{ lidarr_data_directory }}"
+
+- name: lidarr
+  docker_container:
+    name: lidarr
+    image: linuxserver/lidarr
+    pull: true
+    volumes:
+      - "{{ lidarr_music_directory }}:/music:rw"
+      - "{{ lidarr_downloads_directory }}:/downloads:rw"
+      - "{{ lidarr_data_directory }}:/config:rw"
+    ports:
+      - "8686:8686"
+    env:
+      TZ: "{{ ansible_nas_timezone }}"
+      PUID: "{{ lidarr_user_id }}"
+      PGID: "{{ lidarr_group_id }}"
+    restart_policy: unless-stopped
+    memory: 1g
+    labels:
+      traefik.backend: "lidarr"
+      traefik.frontend.rule: "Host:lidarr.{{ ansible_nas_domain }}"
+      traefik.enable: "{{ lidarr_available_externally }}"
+      traefik.port: "8686"

templates/traefik/traefik.toml

@@ -197,6 +197,7 @@ onDemand = false # create certificate when container is created
           "jackett.{{ ansible_nas_domain }}",
           "jellyfin.{{ ansible_nas_domain }}",
           "joomla.{{ ansible_nas_domain }}",
+          "lidarr.{{ ansible_nas_domain }}",
           "miniflux.{{ ansible_nas_domain }}",
           "netdata.{{ ansible_nas_domain }}",
           "nextcloud.{{ ansible_nas_domain }}",