From 036a7f4cfcafd6b34f6cef47a7d80b8fef93d0fb Mon Sep 17 00:00:00 2001 From: Mike Wilson Date: Thu, 23 Feb 2023 15:48:57 -0500 Subject: [PATCH] Configured unpackerr --- ansible/roles/docker-compose/tasks/main.yml | 12 ++++++++ .../qbittorrent/templates/docker-compose.yml | 28 ++++++++++++++++++- .../roles/radarr/templates/docker-compose.yml | 4 +-- ansible/roles/recyclarr/tasks/main.yml | 4 --- .../recyclarr/templates/docker-compose.yml | 4 +-- .../roles/sonarr/templates/docker-compose.yml | 4 +-- ansible/roles/traefik/tasks/main.yml | 8 ------ 7 files changed, 45 insertions(+), 19 deletions(-) diff --git a/ansible/roles/docker-compose/tasks/main.yml b/ansible/roles/docker-compose/tasks/main.yml index 972c513..16a9c6f 100644 --- a/ansible/roles/docker-compose/tasks/main.yml +++ b/ansible/roles/docker-compose/tasks/main.yml @@ -23,3 +23,15 @@ name: docker-compose state: present become: true + +- name: Create docker network for Traefik + community.docker.docker_network: + name: traefik + +- name: Create docker network for Docker Socket Proxy + community.docker.docker_network: + name: docker-socket-proxy + +- name: Create docker network for Starr services + community.docker.docker_network: + name: starr diff --git a/ansible/roles/qbittorrent/templates/docker-compose.yml b/ansible/roles/qbittorrent/templates/docker-compose.yml index 9f144b6..fa914b8 100644 --- a/ansible/roles/qbittorrent/templates/docker-compose.yml +++ b/ansible/roles/qbittorrent/templates/docker-compose.yml @@ -1,5 +1,9 @@ version: "{{ docker_compose_version }}" +networks: + starr: + external: true + services: qbittorrent: container_name: qbittorrent @@ -37,7 +41,6 @@ services: QBT_REM_UNREGISTERED: "True" QBT_REMOVE_ORPHANED: "True" QBT_TAG_NOHARDLINKS: "True" - volumes: - "{{ data_dir }}/qbitmanage:/config" - "{{ media_storage_mnt }}/data/torrents:/data/torrents" # root_dir @@ -55,3 +58,26 @@ services: - "{{ data_dir }}/cross-seed/output:/cross-seeds" command: daemon restart: unless-stopped + + unpackerr: + container_name: unpackerr + image: cr.hotio.dev/hotio/unpackerr + networks: + - starr + environment: + - "PUID={{ service_user.uid }}" + - "PGID={{ media_gid }}" + - UMASK=002 + - TZ={{ timezone }} + - UN_INTERVAL=5m + - UN_FILE_MODE=0664 + - UN_DIR_MODE=0775 + - UN_SONARR_0_URL=http://sonarr:8989 + - "UN_SONARR_0_API_KEY={{ sonarr_api_key }}" + - UN_SONARR_0_PATHS_0=/data/torrents/tv + - UN_RADARR_0_URL=http://radarr:7878 + - "UN_RADARR_0_API_KEY={{ radarr_api_key }}" + - UN_RADARR_0_PATHS_0=/data/torrents/movies + volumes: + - "{{ data_dir }}/unpackerr:/config" + - "{{ media_storage_mnt }}/data/torrents:/data/torrents" diff --git a/ansible/roles/radarr/templates/docker-compose.yml b/ansible/roles/radarr/templates/docker-compose.yml index 3717825..d39cfb8 100644 --- a/ansible/roles/radarr/templates/docker-compose.yml +++ b/ansible/roles/radarr/templates/docker-compose.yml @@ -3,7 +3,7 @@ version: "{{ docker_compose_version }}" networks: traefik: external: true - recyclarr: + starr: external: true services: @@ -13,7 +13,7 @@ services: restart: unless-stopped networks: - traefik - - recyclarr + - starr environment: - "PUID={{ service_user.uid }}" - "PGID={{ media_gid }}" diff --git a/ansible/roles/recyclarr/tasks/main.yml b/ansible/roles/recyclarr/tasks/main.yml index 0fc7e86..61b9b1a 100644 --- a/ansible/roles/recyclarr/tasks/main.yml +++ b/ansible/roles/recyclarr/tasks/main.yml @@ -40,10 +40,6 @@ - radarr.yml become: true -- name: Create recyclarr docker network - community.docker.docker_network: - name: recyclarr - - name: Start docker container community.docker.docker_compose: project_src: "{{ install_directory }}/{{ role_name }}" diff --git a/ansible/roles/recyclarr/templates/docker-compose.yml b/ansible/roles/recyclarr/templates/docker-compose.yml index a2253a3..2b2e116 100644 --- a/ansible/roles/recyclarr/templates/docker-compose.yml +++ b/ansible/roles/recyclarr/templates/docker-compose.yml @@ -1,7 +1,7 @@ version: "{{ docker_compose_version }}" networks: - recyclarr: + starr: external: true services: @@ -11,7 +11,7 @@ services: restart: unless-stopped user: "{{ service_user.uid }}:{{ service_user.uid }}" networks: - - recyclarr + - starr environment: - "TZ={{ timezone }}" volumes: diff --git a/ansible/roles/sonarr/templates/docker-compose.yml b/ansible/roles/sonarr/templates/docker-compose.yml index 37813a7..1824874 100644 --- a/ansible/roles/sonarr/templates/docker-compose.yml +++ b/ansible/roles/sonarr/templates/docker-compose.yml @@ -3,7 +3,7 @@ version: "{{ docker_compose_version }}" networks: traefik: external: true - recyclarr: + starr: external: true services: @@ -13,7 +13,7 @@ services: restart: unless-stopped networks: - traefik - - recyclarr + - starr environment: - "PUID={{ service_user.uid }}" - "PGID={{ media_gid }}" diff --git a/ansible/roles/traefik/tasks/main.yml b/ansible/roles/traefik/tasks/main.yml index 178095a..822793a 100644 --- a/ansible/roles/traefik/tasks/main.yml +++ b/ansible/roles/traefik/tasks/main.yml @@ -1,11 +1,3 @@ -- name: Create docker network for Traefik - community.docker.docker_network: - name: traefik - -- name: Create docker network for Docker Socket Proxy - community.docker.docker_network: - name: docker-socket-proxy - - name: Create install directory file: path: "{{ install_directory }}/traefik"