Update cross-seed config for v6

qbittorrent version

ansible/ansible.cfg

@@ -1,6 +1,7 @@
 [defaults]
 remote_user = mike
 inventory = ./hosts.yml
+vault_password_file = ./vault-pass.sh
 interpreter_python = auto_silent
 
 [privilege_escalation]

ansible/hosts.yml

@@ -1,6 +1,8 @@
-ungrouped:
+
+pve:
   hosts:
     pve:
+    pve-docker:
 
 debian-vms:
   hosts:
@@ -12,3 +14,4 @@ debian-vms:
 arch-vms:
   hosts:
     chat-vm:
+

ansible/main.yml

@@ -1,7 +1,3 @@
-- hosts: pve
-  roles:
-    - pve
-
 - hosts: pve-docker
   roles:
     - pve-docker

ansible/requirements.yml

@@ -1,4 +1,2 @@
 roles:
-  - src: geerlingguy.docker
-  - src: geerlingguy.ntp
   - src: ironicbadger.proxmox_nag_removal

ansible/roles/authentik/handlers/main.yml

@@ -1,5 +1,5 @@
 - name: restart searxng
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     restarted: true
 

ansible/roles/authentik/tasks/main.yml

@@ -24,7 +24,7 @@
   notify: restart searxng
 
 - name: Start docker container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     pull: true
     remove_orphans: yes

ansible/roles/barassistant/tasks/main.yml

@@ -38,7 +38,7 @@
   become: true
 
 - name: Start docker container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     pull: true
     remove_orphans: yes

ansible/roles/beets/tasks/main.yml

@@ -39,7 +39,7 @@
   become: true
 
 - name: Start docker container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     pull: true
     remove_orphans: yes

ansible/roles/calibre-web/tasks/main.yml

@@ -25,7 +25,7 @@
   become: true
 
 - name: Start docker container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     pull: true
     remove_orphans: yes

ansible/roles/calibre/tasks/main.yml

@@ -25,7 +25,7 @@
   become: true
 
 - name: Start docker container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     pull: true
     remove_orphans: yes

ansible/roles/deemix/tasks/main.yml

@@ -25,7 +25,7 @@
   become: true
 
 - name: Start docker container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     pull: true
     remove_orphans: yes

ansible/roles/firefly3/tasks/main.yml

@@ -16,7 +16,7 @@
   become: true
 
 - name: Start docker container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     pull: true
     remove_orphans: yes

ansible/roles/gitea/handlers/main.yml

@@ -4,7 +4,7 @@
     state: restarted
 
 - name: restart gitea
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/gitea"
     restarted: true
 

ansible/roles/gitea/tasks/main.yml

@@ -67,7 +67,7 @@
   become: true
 
 - name: Start docker container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     pull: true
     remove_orphans: yes

ansible/roles/gluetun/tasks/main.yml

@@ -16,7 +16,7 @@
   become: true
 
 - name: Start docker container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     pull: true
     remove_orphans: yes

ansible/roles/lidarr/tasks/main.yml

@@ -25,7 +25,7 @@
   become: true
 
 - name: Start docker container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     pull: true
     remove_orphans: yes

ansible/roles/lubelogger/tasks/main.yml

@@ -16,7 +16,7 @@
   become: true
 
 - name: Start docker container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     pull: true
     remove_orphans: yes

ansible/roles/mealie/tasks/main.yml

@@ -23,7 +23,7 @@
   become: true
 
 - name: Start docker container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     pull: true
     remove_orphans: yes

ansible/roles/navidrome/tasks/main.yml

@@ -23,7 +23,7 @@
   become: true
 
 - name: Start docker container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     pull: true
     remove_orphans: yes

ansible/roles/nextcloud/tasks/main.yml

@@ -23,7 +23,7 @@
   become: true
 
 - name: Start docker container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     pull: true
     remove_orphans: yes

ansible/roles/ntfy/handlers/main.yml

@@ -1,4 +1,4 @@
 - name: restart ntfy
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/ntfy"
     restarted: true

ansible/roles/ntfy/tasks/main.yml

@@ -25,7 +25,7 @@
   become: true
 
 - name: Start docker container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     pull: true
     remove_orphans: yes

ansible/roles/overseerr/tasks/main.yml

@@ -23,7 +23,7 @@
   become: true
 
 - name: Start docker container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     pull: true
     remove_orphans: yes

ansible/roles/prowlarr/tasks/main.yml

@@ -25,7 +25,7 @@
   become: true
 
 - name: Start docker container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     pull: true
     remove_orphans: yes

ansible/roles/qbittorrent/handlers/main.yml

@@ -1,4 +1,4 @@
 - name: restart qbittorrent
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/qbittorrent"
     restarted: true

ansible/roles/qbittorrent/tasks/main.yml

@@ -51,7 +51,7 @@
   become: true
 
 - name: Start docker containers
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
-    pull: true
+    pull: always
     remove_orphans: yes

ansible/roles/qbittorrent/templates/cross-seed/config.js

@@ -5,9 +5,7 @@ module.exports = {
 
     torznab: [
 	    "http://prowlarr.local.{{ personal_domain }}/1/api?apikey={{ prowlarr_api_key }}", // TorrentLeech
-	    "http://prowlarr.local.{{ personal_domain }}/2/api?apikey={{ prowlarr_api_key }}", // DigitalCore
 	    "http://prowlarr.local.{{ personal_domain }}/3/api?apikey={{ prowlarr_api_key }}", // ImmortalSeed
-	    "http://prowlarr.local.{{ personal_domain }}/4/api?apikey={{ prowlarr_api_key }}", // TorrentSeeds
 	    "http://prowlarr.local.{{ personal_domain }}/5/api?apikey={{ prowlarr_api_key }}", // AnimeTosho
 	    "http://prowlarr.local.{{ personal_domain }}/6/api?apikey={{ prowlarr_api_key }}", // Aither
 	    "http://prowlarr.local.{{ personal_domain }}/7/api?apikey={{ prowlarr_api_key }}", // Reelflix
@@ -16,13 +14,9 @@ module.exports = {
 	    "http://prowlarr.local.{{ personal_domain }}/13/api?apikey={{ prowlarr_api_key }}", // hawke-uno
 	    "http://prowlarr.local.{{ personal_domain }}/16/api?apikey={{ prowlarr_api_key }}", // AlphaRatio
 	    "http://prowlarr.local.{{ personal_domain }}/17/api?apikey={{ prowlarr_api_key }}", // FileList
-	    "http://prowlarr.local.{{ personal_domain }}/18/api?apikey={{ prowlarr_api_key }}", // SkipTheCommercials
 	    "http://prowlarr.local.{{ personal_domain }}/19/api?apikey={{ prowlarr_api_key }}", // Cathode-Ray.Tube
     ],
 
-    torrentDir: "/torrents",
-    outputDir: "/cross-seeds",
-    includeEpisodes: false,
     includeNonVideos: false,
     fuzzySizeThreshold: 0.02,
     excludeOlder: "12w",
@@ -30,7 +24,11 @@ module.exports = {
     action: "inject",
     rtorrentRpcUrl: undefined,
     qbittorrentUrl: "https://qbittorrent.local.{{ personal_domain }}",
-    duplicateCategories: true,
+    sonarr: ["https://sonarr.local.{{ personal_domain }}/?apikey={{ sonarr_api_key }}"],
+    radarr: ["https://radarr.local.{{ personal_domain }}/?apikey={{ radarr_api_key }}"],
+    duplicateCategories: true, // This is instead of setting a linkCategory
+    seasonsFromEpisodes: 0.8,
+    matchMode: "partial",
     notificationWebhookUrl: "https://webhooks.cheogram.com/{{ crossseed_webhook_endpoint }}",
     port: 2468,
     rssCadence: "16min",

ansible/roles/qbittorrent/templates/docker-compose.yml

@@ -7,7 +7,7 @@ networks:
 services:
   qbittorrent:
     container_name: qbittorrent
-    image: lscr.io/linuxserver/qbittorrent:libtorrentv1
+    image: lscr.io/linuxserver/qbittorrent:5.0.1
     restart: unless-stopped
     network_mode: "container:gluetun"
     environment:
@@ -45,7 +45,7 @@ services:
     container_name: cross-seed
     depends_on:
       - qbittorrent
-    image: crossseed/cross-seed
+    image: ghcr.io/cross-seed/cross-seed:6
     user: "{{ service_user.uid }}:{{ service_user.uid }}"
     volumes:
       - "{{ data_dir }}/cross-seed:/config"

ansible/roles/qbittorrent/templates/qbitmanage/config.yml

@@ -15,6 +15,9 @@ qbt:
 
 settings:
   force_auto_tmm: true  # Will force qBittorrent to enable Automatic Torrent Management for each torrent.
+  force_auto_tmm_ignore_tags:
+    - cross-seed
+    - Upload
   tracker_error_tag: issue  # Will set the tag of any torrents that do not have a working tracker.
   ignoreTags_OnUpdate: # When running tag-update function, it will update torrent tags for a given torrent even if the torrent has one or more of the tags defined here.
   - noHL
@@ -73,14 +76,14 @@ tracker:
     tag: STC
   cathode:
     tag: CRT
+  ru.org:
+    tag: rutracker
 
 nohardlinks:
   - movies
   - movies.cross-seed
   - tv
   - tv.cross-seed
-  - music
-  - music.cross-seed
 
 
 share_limits:

ansible/roles/radarr/tasks/main.yml

@@ -25,7 +25,7 @@
   become: true
 
 - name: Start docker container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     pull: true
     remove_orphans: yes

ansible/roles/readarr/tasks/main.yml

@@ -25,7 +25,7 @@
   become: true
 
 - name: Start docker container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     pull: true
     remove_orphans: yes

ansible/roles/recyclarr/handlers/main.yml

@@ -1,4 +1,4 @@
 - name: restart recyclarr
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     restarted: true

ansible/roles/recyclarr/tasks/main.yml

@@ -46,7 +46,7 @@
   notify: restart recyclarr
 
 - name: Start docker container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     pull: true
     remove_orphans: yes

ansible/roles/redlib/tasks/main.yml

@@ -16,7 +16,7 @@
   become: true
 
 - name: Start docker container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     pull: true
     remove_orphans: yes

ansible/roles/renovate/tasks/main.yml

@@ -23,7 +23,7 @@
   become: true
 
 - name: Start docker container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     pull: true
     remove_orphans: yes

ansible/roles/rimgo/tasks/main.yml

@@ -16,7 +16,7 @@
   become: true
 
 - name: Start docker container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     pull: true
     remove_orphans: yes

ansible/roles/sabnzbd/tasks/main.yml

@@ -25,7 +25,7 @@
   become: true
 
 - name: Start docker containers
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     pull: true
     remove_orphans: yes

ansible/roles/searxng/handlers/main.yml

@@ -1,5 +1,5 @@
 - name: restart searxng
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     restarted: true
 

ansible/roles/searxng/tasks/main.yml

@@ -24,7 +24,7 @@
   notify: restart searxng
 
 - name: Start docker container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     pull: true
     remove_orphans: yes

ansible/roles/slskd/handlers/main.yml

@@ -1,4 +1,4 @@
 - name: restart service
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     restarted: true

ansible/roles/slskd/tasks/main.yml

@@ -40,7 +40,7 @@
   become: true
 
 - name: Start docker container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     pull: true
     remove_orphans: yes

ansible/roles/sonarr/tasks/main.yml

@@ -25,7 +25,7 @@
   become: true
 
 - name: Start docker container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     pull: true
     remove_orphans: yes

ansible/roles/synapse/handlers/main.yml

@@ -1,4 +1,4 @@
 - name: restart synapse
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     restarted: true

ansible/roles/synapse/tasks/main.yml

@@ -71,7 +71,7 @@
   become: true
 
 - name: Start docker container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     pull: true
     remove_orphans: yes

ansible/roles/tautulli/tasks/main.yml

@@ -33,7 +33,7 @@
   become: true
 
 - name: Start docker container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     pull: true
     remove_orphans: yes

ansible/roles/traefik/handlers/main.yml

@@ -1,4 +1,4 @@
 - name: restart traefik
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/traefik"
     restarted: true

ansible/roles/traefik/tasks/main.yml

@@ -58,7 +58,7 @@
   become: true
 
 - name: Start docker container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/traefik"
     pull: true
     remove_orphans: yes

ansible/roles/unifi-controller/tasks/main.yml

@@ -23,7 +23,7 @@
   become: true
 
 - name: Start docker container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
     pull: true
     remove_orphans: yes

ansible/vault-pass.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+keepassxc-cli show -s -a password ~/vault/Passwords.kdbx 'Ansible Vault'