Fix nas.yml merge conflict

README.md

@@ -12,7 +12,7 @@ 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
+* Various media management tools - Sonarr, Sickchill, CouchPotato, Radarr. Bazarr
 * Media streaming via Plex or Emby
 * Music streaming with Airsonic
 * An RSS newsfeed reader - Miniflux
@@ -30,6 +30,7 @@ Ansible config and a bunch of Docker containers.
 ### Docker Containers Used
 
 * [Airsonic](https://airsonic.github.io/) - catalog and stream music
+* [Bazarr](https://github.com/morpheus65535/bazarr) - companion to Radarr and Sonarr for downloading subtitles
 * [Bitwarden_rs](https://github.com/dani-garcia/bitwarden_rs) - Self-Hosting port of password manager
 * [Calibre](https://hub.docker.com/r/linuxserver/calibre-web) - eBook Library
 * [Cloudflare DDNS](https://hub.docker.com/r/joshuaavalon/cloudflare-ddns/) - automatically update Cloudflare with your IP address

docs/applications/bazarr.md

@@ -0,0 +1,15 @@
+# Bazarr subtitle downloader
+
+Homepage: [https://github.com/morpheus65535/bazarr](https://github.com/morpheus65535/bazarr)
+
+
+Bazarr is a companion application to Sonarr and Radarr. It manages and downloads subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you.
+
+
+## Usage
+
+Set `bazarr_enabled: true` in your `group_vars/all.yml` file.
+
+## Specific Configuration
+
+Follow the [Wiki](https://github.com/morpheus65535/bazarr/wiki) for conecting to Sonarr and Radarr.

docs/configuration/application_ports.md

@@ -5,6 +5,7 @@ By default, applications can be found on the ports listed below.
 | Application     | Port   | Notes     |
 |-----------------|--------|-----------|
 | Couchpotato     | 5050   |           |
+| Bazarr          | 6767   |           |
 | Bitwarden "hub" | 3012   | Web Not.  |
 | Bitwarden       | 19080  | HTTP      |
 | Calibre         | 8084   | HTTP      |

group_vars/all.yml.dist

@@ -37,6 +37,8 @@ couchpotato_enabled: false
 radarr_enabled: false
 get_iplayer_enabled: false
 jackett_enabled: false
+bazarr_enabled: false
+
 
 # Music
 airsonic_enabled: false
@@ -388,6 +390,16 @@ radarr_data_directory: "{{ docker_home }}/radarr"
 radarr_user_id: 0
 radarr_group_id: 0
 
+###
+### Bazarr
+###
+bazarr_available_externally: "false"
+bazarr_data_directory: "{{ docker_home }}/bazarr/config"
+bazarr_tv_directory: "{{ tv_root }}"
+bazarr_movies_directory: "{{ movies_root }}"
+bazarr_user_id: 0
+bazarr_group_id: 0
+
 
 ###
 ### Couchpotato

nas.yml

@@ -179,3 +179,8 @@
   - import_tasks: tasks/homeassistant.yml
     when: (homeassistant_enabled | default(False))
     tags: homeassistant
+    
+  - import_tasks: tasks/bazarr.yml
+    when: (bazarr_enabled | default(False))
+    tags: bazarr
+

tasks/bazarr.yml

@@ -0,0 +1,30 @@
+---
+- name: Create Bazarr Directories
+  file:
+    path: "{{ item }}"
+    state: directory
+  with_items:
+    - "{{ bazarr_data_directory }}"
+
+- name: Bazarr
+  docker_container:
+    name: bazarr
+    image: linuxserver/bazarr
+    pull: true
+    volumes:
+      - "{{ bazarr_tv_directory }}:/tv:rw"
+      - "{{ bazarr_movies_directory }}:/movies:rw"
+      - "{{ bazarr_data_directory }}:/config:rw"
+    ports:
+      - "6767:6767"
+    env:
+      TZ: "{{ ansible_nas_timezone }}"
+      PUID: "{{ bazarr_user_id }}"
+      PGID: "{{ bazarr_group_id }}"
+    restart_policy: unless-stopped
+    memory: 1g
+    labels:
+      traefik.backend: "bazarr"
+      traefik.frontend.rule: "Host:bazarr.{{ ansible_nas_domain }}"
+      traefik.enable: "{{ bazarr_available_externally }}"
+      traefik.port: "6767"

templates/traefik/traefik.toml

@@ -180,6 +180,7 @@ onDemand = false # create certificate when container is created
 
   # we request a certificate for everything, because why not.
   sans = ["airsonic.{{ ansible_nas_domain }}",
+          "bazarr.{{ ansible_nas_domain }}",
           "bitwarden.{{ ansible_nas_domain }}",
           "calibre.{{ ansible_nas_domain }}",
           "couchpotato.{{ ansible_nas_domain }}",