Add audiobookshelf

README.md

@@ -23,15 +23,14 @@ Having Plex and Jellyfin separate from the rest of my docker infrastructure allo
 **Storage:**
 * `/`: 1 TB NVME SSD
 * `/vm_storage`: 2x 240 GB SSD in ZFS mirror for config and data files
-* `/mnt/storage`: mergerfs + SnapRAID pool totaling 56 TB usable storage. Currently single parity disk but hoping to add a second one soon. Drives run btrfs allowing me to utilize [snapraid-btrfs](https://wiki.selfhosted.show/tools/snapraid-btrfs/) for instant snapshotting
+* `/mnt/storage`: mergerfs + SnapRAID pool totaling 150 TiB usable storage with single disk parity (YOLO). Drives run btrfs allowing me to utilize [snapraid-btrfs](https://wiki.selfhosted.show/tools/snapraid-btrfs/) for instant snapshotting
 
 ## Roadmap
 
 * Flesh out backup strategy with btrfs snapshots and restic (separately)
-* Move everything to Arch VMs on Proxmox
-* Move VMs to an Arch Host with virtiofs
+* Potentially migrate media pool to ZFS. I've been lucky so far with no drive failures but realistically if I did have one fail, it would take ages to rebuild with single disk parity and I'd be wishing I had a more robust setup.
+* Move everything to Arch LXCs on Proxmox
+* Possibly set up second Proxmox node for backups
 * Immich for photo management
-* Prosody for XMPP
-* Move forge to forgejo
 * Look into [Wazuh](https://github.com/wazuh/wazuh) for threat prevention/detection
 * [GoAccess](https://goaccess.io/) for web server analytics

ansible/host_vars/pve-docker/main.yml

@@ -7,6 +7,7 @@ docker_compose_directory_mask: 0775
 docker_compose_file_mask: 0664
 install_directory: /srv
 
+vpn_listen_port: 61383
 
 sonarr_api_key: !vault |
   $ANSIBLE_VAULT;1.1;AES256
@@ -26,4 +27,26 @@ radarr_api_key: !vault |
   66613735373430636437343135303238663534316632363534323130313934306536633862303632
   6431656565666466303837336430613062346331646432306164
 
-vpn_listen_port: 61383
+slskd_api_key: !vault |
+  $ANSIBLE_VAULT;1.1;AES256
+  39666166376666636338643866636262356665363135386336343030326539363163333963626163
+  6666313861613930663433623933343439366562356563340a663639363566336435376436303762
+  65613536356139356364653432643736366436333139666165383736323834656130393036306339
+  3065646663366136320a383936643239343039656334336236623232313035633664303434383030
+  66626663303961333936306661623339333634653433633035633734373261366231333365383062
+  33633863366639326236373234326264616136656463353164353730376366373939643061306239
+  36353234333363386563643066313861343633376236333162313737366536613066303633363566
+  36633636653261343431356230666234626162333630333536633233313036326661373836333766
+  39343331396465323261393563306631666632343330306637636365373963613430633236656539
+  63663665386334306235336262656438396336633037363534666438373534623333333061646130
+  653230663539386239396337306130373531
+
+lidarr_api_key: !vault |
+  $ANSIBLE_VAULT;1.1;AES256
+  64336163343037336539353364636235383462643538396534636630323266333730353636366235
+  3938396634613464613639356466616365353738633433320a323333333339316332613266373939
+  33613133653436316230623634323066383535653961386465643334396166353064666135343030
+  3638613966616630390a613261336531343934393634316263303632353038643634663236666162
+  62653835383739653661363962303862613338333865363430383335643635353037656537323034
+  6164633230363736306565646233333466313362653738303065
+

ansible/main.yml

@@ -1,37 +1,3 @@
 - hosts: pve-docker
   roles:
-    - pve-docker
-    - docker-compose
-    - traefik
-    - tautulli
-    - searxng
-    - prowlarr
-    - sonarr
-    - radarr
-    - firefly3
-    - overseerr
-    - ntfy
-    - gluetun
-    - autobrr
-    - name: qbittorrent
-      tags: test
-    - nextcloud
-    - redlib
-    - readarr
-    - calibre
-    - calibre-web
-    - deemix
-    - barassistant
-    - mealie
-    - recyclarr
-    - firefly3
-    - sabnzbd
-    - unifi-controller
-    - slskd
-    - navidrome
-    - lidarr
-    - lubelogger
-    - searxng
-    - synapse
-    - rimgo
     - gitea

ansible/roles/audiobookshelf/tasks/main.yml

@@ -1,5 +1,5 @@
 - name: Create service user
-  user:
+  ansible.builtin.user:
     name: "{{ role_name }}"
     system: true
   register: service_user
@@ -13,6 +13,15 @@
     mode: "{{ docker_compose_directory_mask }}"
   become: true
 
+- name: Create config directory
+  file:
+    path: "{{ data_dir }}/{{ role_name }}"
+    state: directory
+    owner: "{{ docker_user }}"
+    group: "{{ docker_user }}"
+    mode: "{{ docker_compose_directory_mask }}"
+  become: true
+
 - name: Copy docker-compose file to destination
   template:
     src: docker-compose.yml
@@ -22,16 +31,6 @@
     validate: docker compose -f %s config
   become: true
 
-- name: Install script files
-  ansible.builtin.copy:
-    src: "{{ item }}"
-    dest: "{{ data_dir }}/tautulli/scripts"
-    mode: "{{ docker_compose_file_mask }}"
-    owner: "{{ primary_user }}"
-  with_fileglob:
-    - "files/*"
-  become: true
-
 - name: Start docker container
   community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"

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

@@ -0,0 +1,21 @@
+networks:
+  traefik:
+    external: true
+
+services:
+  {{ role_name }}:
+    container_name: "{{ role_name }}"
+    image: ghcr.io/advplyr/audiobookshelf:latest
+    restart: unless-stopped
+    networks:
+      - traefik
+    environment:
+      - "TZ={{ timezone }}"
+    volumes:
+      - "{{ data_dir }}/{{ role_name }}/config:/config"
+      - "{{ data_dir }}/{{ role_name }}/metadata:/metadata"
+      - "{{ media_storage_mnt }}/data/media/books:/books:ro"
+    labels:
+      traefik.enable: true
+      traefik.http.routers.{{ role_name }}.rule: "Host(`audiobooks.{{ personal_domain }}`)"
+      #traefik.http.services.{{ role_name }}.loadbalancer.server.port: 13378

ansible/roles/authentik/tasks/main.yml

@@ -1,30 +0,0 @@
-- name: Create install directory
-  file:
-    path: "{{ install_directory }}/{{ role_name }}"
-    state: directory
-    owner: "{{ docker_user }}"
-    mode: "{{ docker_compose_directory_mask }}"
-  become: true
-
-- name: Copy docker-compose file to destination
-  template:
-    src: docker-compose.yml
-    dest: "{{ install_directory }}/{{ role_name }}/docker-compose.yml"
-    owner: "{{ docker_user }}"
-    mode: "{{ docker_compose_file_mask }}"
-    validate: docker compose -f %s config
-  become: true
-
-- name: Copy settings file to destionation
-  template:
-    src: settings.yml
-    dest: "{{ data_dir }}/{{ role_name }}/settings.yml"
-    owner: "{{ docker_user }}"
-  become: true
-  notify: restart searxng
-
-- name: Start docker container
-  community.docker.docker_compose_v2:
-    project_src: "{{ install_directory }}/{{ role_name }}"
-    pull: always
-    remove_orphans: yes

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

@@ -1,38 +0,0 @@
-version: "{{ docker_compose_version }}"
-
-networks:
-  traefik:
-    external: true
-
-services:
-  searxng:
-    container_name: searxng
-    image: searxng/searxng
-    restart: unless-stopped
-    networks:
-      - traefik
-    volumes:
-      - "{{ data_dir }}/{{ role_name }}:/etc/searxng"
-    cap_drop:
-      - ALL
-    cap_add:
-      - CHOWN
-      - SETGID
-      - SETUID
-    labels:
-      traefik.enable: true
-      traefik.http.routers.searxng.rule: "Host(`search.{{ personal_domain }}`)"
-      traefik.http.routers.searxng.middlewares: lan-whitelist@file
-
-  redis:
-    image: redis:alpine
-    restart: unless-stopped
-    command: redis-server --save "" --appendonly "no"
-    tmpfs:
-      - /var/lib/redis
-    cap_drop:
-      - ALL
-    cap_add:
-      - SETGID
-      - SETUID
-      - DAC_OVERRIDE

ansible/roles/authentik/vars/main.yml

@@ -1,10 +0,0 @@
-searxng_secret_key: !vault |
-  $ANSIBLE_VAULT;1.1;AES256
-  33656138666464373665663339363665346566613637626131363335336535313131333265646539
-  3037373439643964343139383764386364623961383737610a313063613736316437366239663238
-  65333735633661316463336665353138623264396534383865363134613165636164303765356265
-  3865626366613966660a313738353339313133393765643136306361373061366132373130656531
-  61396230346333346636356562353733623332333662653164373630626339376433353663313862
-  61303230613135336662313531313836363466623162666233646231616333643536303233616231
-  62353866333465646162633738383866363338383932623335353038393130323932343363653233
-  62663465386661663262

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

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

ansible/roles/barassistant/files/nginx.conf

@@ -1,22 +0,0 @@
-server {
-    listen 3000 default_server;
-    listen [::]:3000 default_server;
-    server_name _;
-
-    location = /favicon.ico { access_log off; log_not_found off; }
-    location = /robots.txt  { access_log off; log_not_found off; }
-
-    client_max_body_size 100M;
-
-    location /bar/ {
-        proxy_pass http://bar-assistant:3000/;
-    }
-
-    location /search/ {
-        proxy_pass http://meilisearch:7700/;
-    }
-
-    location / {
-        proxy_pass http://salt-rim:8080/;
-    }
-}

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

@@ -1,72 +0,0 @@
-version: "{{ docker_compose_version }}"
-
-networks:
-  traefik:
-    external: true
-
-services:
-  meilisearch:
-    image: getmeili/meilisearch:v1.12
-    restart: unless-stopped
-    networks:
-      - default
-    environment:
-      MEILI_MASTER_KEY: "{{ meili_master_key }}"
-      MEILI_ENV: production
-    volumes:
-      - "{{ data_dir }}/barassistant/meilisearch:/meili_data"
-
-  redis:
-    image: redis
-    restart: unless-stopped
-    networks:
-      - default
-    environment:
-      ALLOW_EMPTY_PASSWORD: "True"
-
-  bar-assistant:
-    container_name: bar-assistant
-    image: barassistant/server:v5
-    restart: unless-stopped
-    networks:
-      - default
-    depends_on:
-      - meilisearch
-      - redis
-    environment:
-      APP_URL: "{{ base_url }}/bar"
-      LOG_CHANNEL: stderr
-      MEILISEARCH_KEY: "{{ meili_master_key }}"
-      MEILISEARCH_HOST: http://meilisearch:7700
-      REDIS_HOST: redis
-      ALLOW_REGISTRATION: "True"
-    volumes:
-      - "{{ data_dir }}/barassistant/barassistant:/var/www/cocktails/storage/bar-assistant"
-
-  salt-rim:
-    image: barassistant/salt-rim:v4
-    restart: unless-stopped
-    networks:
-      - default
-    depends_on:
-      - bar-assistant
-    environment:
-      API_URL: "{{ base_url }}/bar"
-      MEILISEARCH_URL: "{{ base_url }}/search"
-      BAR_NAME: "Cocktails"
-      DESCRIPTION: Why is the rum always gone?
-      DEFAULT_LOCALE: "en-US"
-
-  webserver:
-    image: nginx:alpine
-    restart: unless-stopped
-    networks:
-      - traefik
-      - default
-    volumes:
-      - "./nginx.conf:/etc/nginx/conf.d/default.conf"
-    labels:
-      traefik.enable: true
-      traefik.http.routers.barassistant.rule: "Host(`cocktails.{{ personal_domain }}`)"
-      traefik.http.services.barassistant.loadbalancer.server.port: 3000
-      traefik.http.routers.bariassistant.middlewares: lan-whitelist@file

ansible/roles/barassistant/vars/main.yml

@@ -1,15 +0,0 @@
-meili_master_key: !vault |
-  $ANSIBLE_VAULT;1.1;AES256
-  61306335316339383330323264646132363837376264646235353562666239386463613431366361
-  3333666463623564393061616339393164353465633866320a303530613862386466383161623532
-  61653861653032303232666530623739303231363536316530386566313466333236613331303833
-  3734656334333366650a366261323139363635316264383966626237396338663030393931313532
-  33343737316535336539363135333834333462393330663038376132393661323866656132356566
-  39653732366333306134393965383339336330326566303230613362393366383561303939363937
-  64396230323664393236303939643337393034646637643766323938663961636639326466653332
-  30343132636534613835646163643832373835663030326635323236386361346133633964303137
-  36623631353931343861383232373231613837393936316635393838323466656330653835343932
-  64333432386133313363626630623837643237616132336664303963323062386365623266623333
-  343233663635306361333065313334313361
-
-base_url: "https://cocktails.{{ personal_domain }}"

ansible/roles/beets/files/config.yaml

@@ -1,45 +1,58 @@
-plugins: fetchart embedart scrub replaygain lastgenre chroma web inline
 directory: /music
-library: /config/musiclibrary.blb
-art_filename: cover
-threaded: yes
-original_date: no
 per_disc_numbering: yes
 
+plugins: fetchart embedart web inline lyrics musicbrainz scrub lastgenre replaygain
+
 paths:
     default: $albumartist/$album%aunique{}/%if{$multidisc,$disc}$track - $title
     singleton: Non-Album/$artist - $title
     comp: Various Artists/$album%aunique{}/%if{$multidisc,$disc}$track - $title
-    albumtype_soundtrack: Soundtracks/$album/$track $title 
 item_fields:
   multidisc: 1 if disctotal > 1 else 0 # Makes it so track number is preceded by disc number only if album contains multiple discs
         
 import:
     write: yes
-    copy: no
-    move: yes
-    resume: ask
-    incremental: yes
-    quiet_fallback: skip
+    move: no
+    quiet: yes
     timid: no
-    log: /config/beet.log
+    languages: "en jp es"
+    autotag: yes
 
-lastgenre:
-    auto: yes
-    source: album
+asciify_paths: yes
 
 embedart:
     auto: yes
 
 fetchart:
     auto: yes
-    
-replaygain:
-    auto: no
+    high_resolution: yes
+    source:
+      - filesystem
+      - itunes
+      - coverart
+      - amazon
 
+match:
+    strong_rec_thresh: 0.10
+    ignored_media: ['12" Vinyl']
+
+lyrics:
+    auto: yes
+    sources: [lrcmux]
+    
 scrub:
     auto: yes
 
+replaygain:
+    auto: yes
+    backend: ffmpeg
+
+# Consider directory empty even if files matching the below patterns are present
+clutter:
+  - "*.jpg"
+  - "*.png"
+  - "*.nfo"
+
 replace:
     '^\.': _
     '[\x00-\x1f]': _

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

@@ -1,5 +1,3 @@
-version: "{{ docker_compose_version }}"
-
 networks:
   traefik:
     external: true

ansible/roles/calibre-web/templates/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

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

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

ansible/roles/deemix/tasks/main.yml

@@ -1,31 +0,0 @@
-- name: Create service user
-  user:
-    name: "{{ role_name }}"
-    groups: "{{ media_group }}"
-    append: yes
-    system: true
-  register: service_user
-  become: true
-
-- name: Create install directory
-  file:
-    path: "{{ install_directory }}/{{ role_name }}"
-    state: directory
-    owner: "{{ docker_user }}"
-    mode: "{{ docker_compose_directory_mask }}"
-  become: true
-
-- name: Copy docker-compose file to destination
-  template:
-    src: docker-compose.yml
-    dest: "{{ install_directory }}/{{ role_name }}/docker-compose.yml"
-    owner: "{{ docker_user }}"
-    mode: "{{ docker_compose_file_mask }}"
-    validate: docker compose -f %s config
-  become: true
-
-- name: Start docker container
-  community.docker.docker_compose_v2:
-    project_src: "{{ install_directory }}/{{ role_name }}"
-    pull: always
-    remove_orphans: yes

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

@@ -1,26 +0,0 @@
-version: "{{ docker_compose_version }}"
-
-networks:
-  traefik:
-    external: true
-
-services:
-  {{ role_name }}:
-    container_name: "{{ role_name }}"
-    image: registry.gitlab.com/bockiii/deemix-docker
-    restart: unless-stopped
-    networks:
-      - traefik
-    environment:
-      - "PUID={{ service_user.uid }}"
-      - "PGID={{ media_gid }}"
-      - "TZ={{ timezone }}"
-      - "UMASK_SET=002"
-      - "DEEMIX_SINGLE_USER=true"
-    volumes:
-      - "{{ data_dir }}/{{ role_name }}:/config"
-      - "{{ media_storage_mnt }}/data/import/music/deemix:/downloads"
-    labels:
-      traefik.enable: true
-      traefik.http.routers.{{ role_name }}.rule: "Host(`{{ role_name }}.local.{{ personal_domain }}`)"
-      traefik.http.routers.{{ role_name }}.middlewares: lan-whitelist@file

ansible/roles/dispatcharr/tasks/main.yml

@@ -1,12 +1,5 @@
-- name: Create service user
-  user:
-    name: "{{ role_name }}"
-    system: true
-  register: service_user
-  become: true
-
 - name: Create install directory
-  file:
+  ansible.builtin.file:
     path: "{{ install_directory }}/{{ role_name }}"
     state: directory
     owner: "{{ docker_user }}"
@@ -14,7 +7,7 @@
   become: true
 
 - name: Copy docker-compose file to destination
-  template:
+  ansible.builtin.template:
     src: docker-compose.yml
     dest: "{{ install_directory }}/{{ role_name }}/docker-compose.yml"
     owner: "{{ docker_user }}"

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

@@ -0,0 +1,24 @@
+networks:
+  traefik:
+    external: true
+
+services:
+  dispatcharr:
+    container_name: "{{ role_name }}"
+    image: ghcr.io/dispatcharr/dispatcharr:latest
+    restart: unless-stopped
+    network_mode: "container:gluetun"
+    environment:
+      - DISPATCHARR_ENV=aio
+      - REDIS_HOST=localhost
+      - CELERY_BROKER_URL=redis://localhost:6379/0
+      - DISPATCHARR_LOG_LEVEL=info
+    volumes:
+      - "{{ data_dir }}/{{ role_name }}:/data"
+    devices:
+      - /dev/dri/renderD128:/dev/dri/renderD128
+    labels:
+      traefik.enable: true
+      traefik.http.routers.dispatcharr.rule: "Host(`dispatcharr.local.{{ personal_domain }}`)"
+      traefik.http.routers.dispatcharr.middlewares: lan-whitelist@file
+      traefik.http.services.dispatcharr.loadbalancer.server.port: 9191

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

@@ -1,66 +0,0 @@
-version: "{{ docker_compose_version }}"
-
-networks:
-  firefly_iii:
-    driver: bridge
-  traefik:
-    external: true
-
-services:
-  app:
-    image: fireflyiii/core:latest
-    container_name: firefly_iii_core
-    restart: unless-stopped
-    volumes:
-      - "{{ data_dir }}/firefly3/upload:/var/www/html/storage/upload"
-    depends_on:
-      - db
-    networks:
-      - traefik
-      - default
-    environment:
-      APP_ENV: local
-      APP_DEBUG: "false"
-      APP_KEY: "{{ app_key }}"
-      SITE_OWNER: {{ owner_email_address }}
-      DEFAULT_LANGUAGE: "en_US"
-      DEFAULT_LOCALE: equal
-      TZ: {{ timezone }}
-      TRUSTED_PROXIES: "*"
-      APP_LOG_LEVEL: notice
-      AUDIT_LOG_LEVEL: info
-      DB_CONNECTION: mysql
-      DB_HOST: db
-      DB_PORT: 3306
-      DB_DATABASE: firefly
-      DB_USERNAME: firefly
-      DB_PASSWORD: firefly
-      APP_URL: "https://firefly.local.{{ personal_domain }}"
-      STATIC_CRON_TOKEN: "Y5uNSbJoK4FKUC9gVE5hq8YFEbFmc6BK"
-    labels:
-      traefik.enable: true
-      traefik.http.routers.firefly.rule: "Host(`firefly.local.{{ personal_domain }}`)"
-      traefik.http.routers.firefly.middlewares: lan-whitelist@file
-
-  db:
-    image: mariadb
-    restart: always
-    volumes:
-      - "{{ data_dir }}/mariadb/firefly3:/var/lib/mysql"
-    environment:
-      MYSQL_RANDOM_ROOT_PASSWORD: "yes"
-      MYSQL_USER: firefly
-      MYSQL_PASSWORD: firefly
-      MYSQL_DATABASE: firefly
-  cron:
-    #
-    # To make this work, set STATIC_CRON_TOKEN in your .env file or as an environment variable and replace REPLACEME below
-    # The STATIC_CRON_TOKEN must be *exactly* 32 characters long
-    #
-    image: alpine
-    restart: always
-    container_name: firefly_iii_cron
-    command: sh -c "echo \"0 3 * * * wget -qO- https://firefly.local.{{ personal_domain }}/api/v1/cron/Y5uNSbJoK4FKUC9gVE5hq8YFEbFmc6BK\" | crontab - && crond -f -L /dev/stdout"
-    networks:
-      - firefly_iii
-      - default

ansible/roles/firefly3/vars/main.yml

@@ -1,17 +0,0 @@
-owner_email_address: !vault |
-  $ANSIBLE_VAULT;1.1;AES256
-  61373861363433363938396137653461363830323539316438323861326437663364383032363064
-  6438303462336466373233663366303263313139333830330a623465633166653530633961643162
-  65303032386661393063393134643436653737666163373833383036316234393563313536353036
-  3839663034393730340a626361646463636137636535653632343064353461656532656236633865
-  66636634323434356436313737336635363832333262383331333034313530663463
-
-app_key: !vault |
-  $ANSIBLE_VAULT;1.1;AES256
-  31333563616230396135363562313038346138633631613832646463343666643733333366303561
-  3461316337303862616662333031306231613532383534340a643236306232383466333531626466
-  33313830646365333935313237663134343033396166623730303030636438656435313462633762
-  3134643738616365330a636366343736306539666565663866626537303431366633646638663563
-  32616439336338393663373466323630323733393031633564383737383465313434313230323038
-  6534636266653166633539326632623165663436323936643031
-

ansible/roles/game-thumbs/tasks/main.yml

@@ -1,12 +1,5 @@
-- name: Create service user
-  user:
-    name: "{{ role_name }}"
-    system: true
-  register: service_user
-  become: true
-
 - name: Create install directory
-  file:
+  ansible.builtin.file:
     path: "{{ install_directory }}/{{ role_name }}"
     state: directory
     owner: "{{ docker_user }}"
@@ -14,7 +7,7 @@
   become: true
 
 - name: Copy docker-compose file to destination
-  template:
+  ansible.builtin.template:
     src: docker-compose.yml
     dest: "{{ install_directory }}/{{ role_name }}/docker-compose.yml"
     owner: "{{ docker_user }}"

ansible/roles/game-thumbs/templates/docker-compose.yml

@@ -0,0 +1,31 @@
+services:
+  game-thumbs:
+    image: ghcr.io/sethwv/game-thumbs:latest
+    container_name: game-thumbs
+    restart: unless-stopped
+    labels:
+      - "autoheal=true"
+    ports:
+      - 3050:3050
+    environment:
+      PORT: 3050
+      NODE_ENV: ${NODE_ENV:-production}
+      SHOW_TIMESTAMP: ${SHOW_TIMESTAMP:-true}
+      LOG_TO_FILE: ${LOG_TO_FILE:-false}
+      MAX_LOG_FILES: ${MAX_LOG_FILES:-10}
+    volumes:
+      - "{{ data_dir }}/game-thumbs/cache:/app/.cache
+    healthcheck:
+      test: ["CMD", "node", "-e", "require('http').get('http://localhost:3050/health', (r) => {let d='';r.on('data', (c) => d+=c);r.on('end', () => {if (r.statusCode !== 200) process.exit(1);const j=JSON.parse(d);process.exit(j.status==='ok'?0:1)})}).on('error', () => process.exit(1))"]
+      interval: 30s
+      timeout: 5s
+      start_period: 10s
+      retries: 3
+  autoheal:
+     image: willfarrell/autoheal:latest
+     container_name: autoheal
+     restart: unless-stopped
+     volumes:
+       - /var/run/docker.sock:/var/run/docker.sock
+     environment:
+       AUTOHEAL_CONTAINER_LABEL: "autoheal"

ansible/roles/gitea/tasks/main.yml

@@ -45,6 +45,8 @@
   loop:
     - data
     - config
+    - runner/data
+    - runner/config
   become: true
 
 - name: Install configuration file

ansible/roles/gitea/templates/config.yaml

@@ -0,0 +1,302 @@
+# Every option with its default value, all commented out. Read this file, do not copy it.
+# `./gitea-runner config init` writes a config file to copy the lines you change into.
+
+# Logging for the runner process itself (messages printed to stderr), plus the copy of
+# each task's log kept under log.job. Neither controls how workflow step output is streamed
+# to the Gitea UI; tune that with runner.log_report_* below.
+log:
+  # logrus severity: trace, debug, info, warn, error, fatal, panic.
+  # trace and debug turn on caller/file:line in log lines. Default if omitted: info.
+  #level: info
+  # Write a copy of each task's log to dir as <start time>-task-<id>.log, so a job's output
+  # survives a failure to send it to Gitea. A path turns them on, empty turns them off.
+  # retention is how long a log is kept (0s keeps all), max_size caps one log (0 is no limit).
+  #job:
+  #  dir: ""
+  #  retention: 168h
+  #  max_size: 1GB
+
+runner:
+  # Where to store the registration result.
+  #file: .runner
+  # Execute how many tasks concurrently at the same time.
+  # With `container.network` empty, each concurrent docker job takes a subnet from the
+  # daemon's address pool, so a high capacity can exhaust it. See `default-address-pools`
+  # in the docker daemon config.
+  #capacity: 1
+  # Extra environment variables to run jobs.
+  #envs:
+  #  A_TEST_ENV_NAME_1: a_test_env_value_1
+  #  A_TEST_ENV_NAME_2: a_test_env_value_2
+  # Extra environment variables to run jobs from a file.
+  # It will be ignored if it's empty or the file doesn't exist.
+  #env_file: .env
+  # The timeout for a job to be finished.
+  # Please note that the Gitea instance also has a timeout (3h by default) for the job.
+  # So the job could be stopped by the Gitea instance if its timeout is shorter than this.
+  #timeout: 3h
+  # The timeout for the runner to wait for running jobs to finish when shutting down.
+  # Any running jobs that haven't finished after this timeout will be cancelled.
+  #shutdown_timeout: 0s
+  # Whether skip verifying the TLS certificate of the Gitea instance.
+  #insecure: false
+  # The timeout for fetching the job from the Gitea instance.
+  # Values above the 60s RPC timeout are capped to it.
+  #fetch_timeout: 5s
+  # The interval for fetching the job from the Gitea instance.
+  #fetch_interval: 2s
+  # The maximum interval for fetching the job from the Gitea instance.
+  # The runner uses exponential backoff when idle, increasing the interval up to this maximum.
+  # Set to 0 or same as fetch_interval to disable backoff.
+  #fetch_interval_max: 5s
+  # While idle, remove stale bind-workdir task directories and orphaned host-mode
+  # scratch directories (left behind when a host cleanup delete stalls) older than
+  # this duration. Setting either workdir_cleanup_age or idle_cleanup_interval to 0
+  # (or any non-positive value) disables stale-directory cleanup entirely, along with
+  # the docker network and volume cleanup below.
+  #workdir_cleanup_age: 24h
+  # Cadence for the idle cleanup pass. Besides the directories above, on runners that use
+  # docker it removes the per-job networks and volumes of jobs this runner did not live to
+  # tear down, which would otherwise hold a subnet of the daemon address pool and the job's
+  # workspace contents until the host is rebuilt.
+  #idle_cleanup_interval: 10m
+  # The base interval for periodic log flush to the Gitea instance.
+  # Logs may be sent earlier if the buffer reaches log_report_batch_size
+  # or if log_report_max_latency expires after the first buffered row.
+  #log_report_interval: 5s
+  # The maximum time a log row can wait before being sent.
+  # This ensures even a single log line appears on the frontend within this duration.
+  # Must be less than log_report_interval to have any effect.
+  #log_report_max_latency: 3s
+  # Flush logs immediately when the buffer reaches this many rows.
+  # This ensures bursty output (e.g., npm install) is delivered promptly.
+  #log_report_batch_size: 100
+  # The interval for reporting task state (step status, timing) to the Gitea instance.
+  # State is also reported on step transitions (start/stop) and after each log flush.
+  #state_report_interval: 5s
+  # Per-attempt deadline for flushing the final logs and task state when a job
+  # finishes, on a detached context so a server cancel can't block the acknowledgement.
+  #report_close_timeout: 10s
+  # The github_mirror of a runner is used to specify the mirror address of the github that pulls the action repository.
+  # It works when something like `uses: actions/checkout@v4` is used and DEFAULT_ACTIONS_URL is set to github,
+  # and github_mirror is not empty. In this case,
+  # it replaces https://github.com with the value here, which is useful for some special network environments.
+  #github_mirror: ''
+  # When true (the default), fetch only the requested ref of an action repository (e.g. actions/checkout@v4) at depth 1 instead of cloning every branch's full history.
+  # Set to false to clone the full history.
+  #action_shallow_clone: true
+  # When true (the default), inject the ACT=true environment variable into jobs.
+  # Set to false so workflows gated on `if: ${{ !env.ACT }}` behave like they do on GitHub.
+  #set_act_env: true
+  # When true (the default), apply compatibility patches to the actions a job runs, so actions
+  # written for GitHub work against this instance. Set to false to run them exactly as published,
+  # at the price of the stock artifact actions refusing and the cache client keeping to v1.
+  #patch_actions: true
+  # The labels of a runner are used to determine which jobs the runner can run, and how to run them.
+  # Like: "macos-arm64:host" or "ubuntu-latest:docker://docker.gitea.com/runner-images:ubuntu-latest"
+  # Find more images provided by Gitea at https://gitea.com/gitea/runner-images .
+  # If it's empty when registering, it will ask for inputting labels.
+  # If it's empty when execute `daemon`, will use labels in `.runner` file.
+  #labels:
+  #  - "ubuntu-latest:docker://docker.gitea.com/runner-images:ubuntu-latest"
+  #  - "ubuntu-24.04:docker://docker.gitea.com/runner-images:ubuntu-24.04"
+  #  - "ubuntu-22.04:docker://docker.gitea.com/runner-images:ubuntu-22.04"
+  # Allocate a pseudo-TTY for each step's process. Applies to both host and docker backends.
+  # Default false matches GitHub actions/runner. Enable only for jobs that need an interactive
+  # terminal; tools like `docker build` emit redrawing progress frames into the captured log
+  # when a TTY is present.
+  #allocate_pty: false
+  # Image for a job whose runs-on matches none of the labels above. A runner without a
+  # docker daemon runs such a job on the host instead.
+  #default_image: "docker.gitea.com/runner-images:ubuntu-latest"
+  # What to mount at RUNNER_TOOL_CACHE (/opt/hostedtoolcache), where setup actions install tools:
+  #   none:   nothing. A docker job sees what its image ships there, a host job an empty dir, and
+  #           either way what it installs is gone when the job ends.
+  #   shared: one tool cache every job reuses. Two jobs writing the same tool version at once
+  #           corrupt it, so use it only with capacity 1.
+  #tool_cache_mode: none
+  # Optional executable on the host, run once after each task's built-in cleanup
+  # (post-steps, container teardown, bind-workdir removal). Additive only.
+  #
+  # IMPORTANT: While this script runs the runner stops task heartbeats and stays
+  # offline from Gitea's perspective until the script exits. A script that never
+  # returns blocks new work until post_task_script_timeout kills it (default 5m).
+  # Keep scripts short; set post_task_script_timeout to a safe upper bound.
+  #
+  # Output -> runner process log (not the job log). Non-zero exit -> warning only.
+  # Windows: use .exe, .bat, or .cmd. PowerShell (.ps1) is not supported yet as
+  # the configured path; wrap PowerShell commands in a .cmd file instead.
+  # Full guide: docs/post-task-script.md
+  #post_task_script: ''
+  # Hard limit on post_task_script runtime. Default if omitted: 5m.
+  #post_task_script_timeout: 5m
+  # Scripts run inside the job environment before the job's first step and after its last
+  # one, the equivalent of GitHub's ACTIONS_RUNNER_HOOK_JOB_STARTED and
+  # ACTIONS_RUNNER_HOOK_JOB_COMPLETED, which are read when these are unset. The paths are
+  # resolved inside the job environment. Either one failing fails the job.
+  # Full guide: docs/job-hooks.md
+  #hooks:
+  #  job_started: ''
+  #  job_completed: ''
+
+cache:
+  # Enable caching (used by actions/cache and similar actions). Off means no built-in server is
+  # started and no job is registered with an external_server either.
+  #enabled: true
+  # Directory where cache blobs are stored on disk. Default: $HOME/.cache/actcache
+  # Ignored when external_server is set.
+  #dir: ""
+  # Outbound IP or hostname that job containers use to reach this runner's cache server.
+  # Leave empty to detect automatically. 0.0.0.0 is not valid here.
+  # If the runner itself runs in Docker, automatic detection can choose an
+  # address on the runner container's network that job containers cannot reach
+  # when the runner creates a separate per-job network. In that case, set this
+  # to a hostname/IP reachable from job containers, and set port to a fixed
+  # published port or put the job containers on a shared Docker network.
+  # Ignored when external_server is set.
+  #host: ""
+  # Port for the built-in cache server. 0 picks a random free port.
+  # Ignored when external_server is set.
+  #port: 0
+  # URL of a shared `gitea-runner cache-server` to use instead of starting a local one.
+  # Set on every runner that should share a cache pool. A trailing slash is optional.
+  # Jobs reach the server at this URL too, so set it to the reverse proxy when one fronts the server.
+  # Example: "http://cache-host:8088/"
+  # Requires external_secret (below) to match the value on the cache-server.
+  #external_server: ""
+  # Shared secret between this runner and the external cache-server.
+  # Required when external_server is set. Must be identical on every runner and the cache-server.
+  # Generate with: openssl rand -hex 32
+  #external_secret: ""
+  # Path to a file containing the shared secret, as an alternative to external_secret.
+  # Use this to keep the secret out of this file.
+  # Surrounding whitespace is trimmed, so a trailing newline in the file is fine.
+  # Setting both external_secret and external_secret_file is an error.
+  #external_secret_file: ""
+  # When true, reuse a cached action instead of fetching from the remote on every job.
+  # A moved tag (e.g. a re-tagged "v6") or an updated branch stays at the cached commit
+  # until its cache entry expires or is manually removed.
+  #offline_mode: false
+  # Serve the actions cache service v2 API. The actions that use it fall back to v1 on any host
+  # they do not take for GitHub, so reaching it means editing that check out of their own bundle,
+  # put back after the copy into the job. That edit is made either way, this only governs the API
+  # advertised. A bundle that does not match is left alone. With v2, artifact uploads go via the
+  # cache server unless container jobs cannot reach its Docker network.
+  #v2: true
+  # How the cache server discards entries, ignored when external_server is set since that
+  # server applies its own. Leave a setting out for its default; 0s or 0 turns the three
+  # limits off. Sizes accept 10GB, 512mb, 1TiB or a plain byte count, binary either way.
+  # Whatever these allow, the cache still sheds entries to keep free space on its volume
+  # above health_check.min_free_disk_space_mb when health checks are enabled.
+  # Remove entries nothing has read or written within this window. Only last access counts.
+  #retention: 168h
+  # Cap one repository, removing its least recently accessed entries until it fits. An entry
+  # larger than the limit is dropped rather than emptying the repository to make room.
+  #repo_size_limit: 10GB
+  # Cap the whole cache the same way. Off by default, since the free space floor bounds it.
+  #size_limit: 0
+  # Minimum time between two eviction sweeps. This one has no "off".
+  #sweep_interval: 1h
+
+container:
+  # Specifies the network to which the container will connect.
+  # Could be host, bridge or the name of a custom network.
+  # If it's empty, runner will create a network automatically.
+  # For dockerized runners using the built-in cache server, a custom shared
+  # network can be required so job containers can reach cache.host/cache.port.
+  # Deprecated: `network_mode` is still accepted for old configs; use `network` instead.
+  #network: ""
+  # network_create_options only apply when `network` is left empty and the runner
+  # auto-creates a per-job network that does not already exist. They have no effect
+  # when a custom `network` name is set, because that network is used as-is and never
+  # created by the runner. Omit the entire block to use Docker's defaults. An auto-created
+  # network is labelled com.gitea.runner.uuid=<this runner's uuid>, which is how the idle
+  # cleanup tells its own leftovers apart from those of other runners on the same daemon.
+  #network_create_options:
+  #  enable_ipv4: true # Omit to use Docker's default (IPv4 enabled). Set false to disable IPv4.
+  #  enable_ipv6: false # Omit to use Docker's default (IPv6 disabled). Enabling it requires dockerd started with --ipv6.
+  # Whether to use privileged mode or not when launching task containers (privileged mode is required for Docker-in-Docker).
+  #privileged: false
+  # Any other options to be used when the container is started, for example:
+  #   options: --add-host=my.gitea.url:host-gateway
+  # A volume declared here replaces the one the runner would mount on the same container path, so the
+  # tool cache can be kept on the host. Its source must also be allowed by valid_volumes below:
+  #   options: --volume /host/toolcache:/opt/hostedtoolcache
+  # With privileged disabled, options that could escape the container (--security-opt, --device,
+  # --cap-add, --pid, ...) are ignored in a workflow's container.options, but keep working here.
+  #options:
+  # The parent directory of a job's working directory.
+  # NOTE: There is no need to add the first '/' of the path as runner will add it automatically.
+  # If the path starts with '/', the '/' will be trimmed.
+  # For example, if the parent directory is /path/to/my/dir, workdir_parent should be path/to/my/dir
+  # If it's empty, /workspace will be used.
+  # Purely numeric subdirectories under this path are reserved for task workspaces and may be removed by idle cleanup.
+  #workdir_parent:
+  # Volumes (including bind mounts) can be mounted to containers. Glob syntax is supported, see https://github.com/gobwas/glob
+  # You can specify multiple volumes. If the sequence is empty, no volumes can be mounted.
+  # For example, if you only allow containers to mount the `data` volume and all the json files in `/src`, you should change the config to:
+  # valid_volumes:
+  #   - data
+  #   - /src/*.json
+  # If you want to allow any volume, please use the following configuration:
+  # valid_volumes:
+  #   - '**'
+  #valid_volumes: []
+  # Overrides the docker client host with the specified one.
+  # If it's empty, runner will find an available docker host automatically.
+  # If it's "-", runner will find an available docker host automatically, but won't mount it into the job and action containers.
+  # If it's not empty or "-", the specified docker host will be used. An error will be returned if it doesn't work.
+  #docker_host: ""
+  # Pull docker image(s) even if already present.
+  # Defaults to false when the key is omitted.
+  # Two exceptions: an image pinned by digest (image@sha256:...) cannot change, so it is never
+  # re-pulled, and a pull that fails while a copy is already on the host does not fail the job,
+  # which runs on that copy with a warning in its log.
+  #force_pull: false
+  # Rebuild docker image(s) even if already present
+  #force_rebuild: false
+  # Always require a reachable docker daemon, even if not required by runner
+  #require_docker: false
+  # Timeout to wait for the docker daemon to be reachable, if docker is required by require_docker or runner
+  #docker_timeout: 0s
+  # Mount the workspace from a host directory instead of a Docker volume, so jobs
+  # can bind-mount it by its own path into sibling containers (".:/app" in docker
+  # compose). Not needed when jobs get the Docker proxy or workflows use the
+  # GITEA_DOCKER_WORKSPACE variable.
+  # The workspace parent directory must be mounted into the runner container.
+  #bind_workdir: false
+  # How long a job waits for a service container that declares a healthcheck to become
+  # healthy. A negative value (e.g. -1s) starts the steps without waiting.
+  #service_ready_timeout: 5m
+
+host:
+  # The parent directory of a job's working directory.
+  # If it's empty, $HOME/.cache/act/ will be used.
+  #workdir_parent:
+
+# Optional local task-admission checks. Disabled by default. When enabled, low
+# disk space or a failing script pauses new task fetching; existing jobs continue.
+# No health checks run while any job is active; the last result is reused until idle.
+health_check:
+  #enabled: false
+  # Minimum free space required on the filesystem holding runner workspaces.
+  # Defaults to 1024 MiB when omitted or set to zero.
+  #min_free_disk_space_mb: 1024
+  # Optional additional executable. A non-zero exit, timeout, or startup failure
+  # marks the runner unavailable.
+  #script: ''
+  # How long a script result is cached and its maximum execution time.
+  #interval: 30s
+  #timeout: 10s
+
+metrics:
+  # Enable the Prometheus metrics endpoint.
+  # When enabled, metrics are served at /metrics, liveness at /healthz, and
+  # task-admission readiness at /readyz.
+  #enabled: false
+  # The address for the metrics HTTP server to listen on.
+  # Defaults to localhost only. Set to ":9101" to allow external access,
+  # but ensure the port is firewall-protected as there is no authentication.
+  #addr: "127.0.0.1:9101"
+  # Consecutive polling failures may last this long before /readyz returns 503.
+  #readiness_grace: 30s

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

@@ -1,5 +1,3 @@
-version: "{{ docker_compose_version }}"
-
 networks:
   traefik:
     external: true
@@ -37,3 +35,16 @@ services:
       POSTGRESS_DB: gitea
     volumes:
       - "{{ data_dir }}/postgres/gitea:/var/lib/postgresql/data"
+
+  runner:
+    image: docker.io/gitea/runner:3
+    restart: unless-stopped
+    environment:
+      CONFIG_FILE: /config/config.yaml
+      GITEA_INSTANCE_URL: "https://git.{{ personal_domain }}"
+      GITEA_RUNNER_REGISTRATION_TOKEN: "{{ runner_registration_token }}"
+    volumes:
+      - "{{ data_dir }}/gitea/runner/config:/config"
+      - "{{ data_dir }}/gitea/runner/data:/data"
+      - /var/run/docker.sock:/var/run/docker.sock
+

ansible/roles/gitea/vars/main.yml

@@ -29,3 +29,13 @@ internal_token: !vault |
   62363962636132333266646431373162313261363635646166643462396161303635653338626431
   35626638386562386361383035623431306465623738616361346139343134643134613563343038
   38623638373335346533613536616136346638616465386637666463353234366237
+
+runner_registration_token: !vault |
+  $ANSIBLE_VAULT;1.1;AES256
+  64313833353738306166363964613936303966333837356133383161373830366365363934646532
+  3539343564386232373765643437393463383036323033630a353934353933316566343863303039
+  38666537613663656633646439323930333036613937656238356538316338346537303663626531
+  3632623339383237380a643361616566663334353935313733346236353237633163633835333164
+  36366635373236343666616230613033333733376264663761353731353662643163306137343066
+  3664343135613539306537306330376331396264373631316439
+

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

@@ -1,5 +1,3 @@
-version: "3"
-
 networks:
   traefik:
     external: true
@@ -21,13 +19,14 @@ services:
       VPN_TYPE: wireguard
       VPN_SERVICE_PROVIDER: custom
       WIREGUARD_PRIVATE_KEY: "{{ torguard_private_key }}"
-      WIREGUARD_PUBLIC_KEY: "sC96pq087HvVpRNA5oKjiotwGuRRZbdLiTgmqP+Du2s="
+      WIREGUARD_PUBLIC_KEY: "fLDSO1YJxryyquen+XupegFQWhsWkGva+g3BtuIRyWs="
       WIREGUARD_ADDRESSES: "{{ torguard_address }}"
-      VPN_ENDPOINT_IP: "146.70.137.122"
+      VPN_ENDPOINT_IP: "38.96.254.100"
       VPN_ENDPOINT_PORT: "1443"
-      FIREWALL_VPN_INPUT_PORTS: "55230"
+      FIREWALL_VPN_INPUT_PORTS: "45333"
+      FIREWALL_OUTBOUND_SUBNETS: "10.0.0.0/24"
       DOT: "off"
-      DNS_ADDRESS: "9.9.9.9"
+      DNS_ADDRESS: "10.8.0.1"
       TZ: "{{ timezone }}"
       HTTPPROXY: "on"
       HTTPPROXY_USER: httpproxy

ansible/roles/gluetun/vars/main.yml

@@ -1,17 +1,17 @@
 torguard_private_key: !vault |
   $ANSIBLE_VAULT;1.1;AES256
-  38386463313536353366303733396232663136393431656432346332353131333630343730336262
-  3436633832613935323134393662666233643032613463310a656364653639363739306265306361
-  61616261663139323238636634306330393733393065373138323463653935366335363639626265
-  3862396562393536320a366335363435636436333139356239306262303838333162613530643732
-  64336161306633343866383538303536316163396566326336633961333136373736373364343430
-  3361613566346563346664353834613361616666383065303162
+  30666664646463323238386164393462633236643531656564343835383661623335363562396631
+  3439303437393364353064653338376563383362316237300a616338303763653034656564316630
+  30626437396531323763633133363565383530393737383064366661313430623936646264373933
+  3734313736356534390a633837333264383233313962326636323534346163353064306539323230
+  32373237396534366638356631333266386265353862666436323665376339363236336361653937
+  6236396266336637383032643434656234653232303236373931
 
 torguard_address: !vault |
   $ANSIBLE_VAULT;1.1;AES256
-  61626363346663646462626434316566353464623161396362356330333338616466633266383733
-  3363393464616534316339393935646438333764383765370a383236613539613866373838353061
-  39393661393035373132663439653361363761613264656462623237336637356162623439336238
-  6635383734303539640a336366373164336262363630636562636136316166343362306265326163
-  39306365613539383666303130633937643238653635393738323665323938646335
+  38313562363039623039623164373435653833333763653562626434666431666435653037393034
+  6130396230363362633761343636313066333433363135370a333732353335336231366433393631
+  38393131326565633433363138346363343863393730613936643034353435656438613331343763
+  3138616466623530350a383164616533303461396365316331633061333431366639356637396337
+  34343533366261343837653763636333326634373935316465613233316564623266
 

ansible/roles/lidarr/tasks/main.yml

@@ -24,6 +24,15 @@
     validate: docker compose -f %s config
   become: true
 
+- name: Create data directory
+  ansible.builtin.file:
+    path: "{{ data_dir }}/{{ role_name }}/config"
+    state: directory
+    owner: "{{ service_user.uid }}"
+    group: "{{ primary_gid }}"
+    mode: "{{ docker_compose_directory_mask }}"
+  become: true
+
 - name: Start docker container
   community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"

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

@@ -1,5 +1,3 @@
-version: "{{ docker_compose_version }}"
-
 networks:
   traefik:
     external: true
@@ -17,7 +15,7 @@ services:
       - "TZ={{ timezone }}"
       - "UMASK=002"
     volumes:
-      - "{{ data_dir }}/{{ role_name }}:/config"
+      - "{{ data_dir }}/{{ role_name }}/config:/config"
       - "{{ media_storage_mnt }}/data:/data"
     labels:
       traefik.enable: true

ansible/roles/lidarr/vars/main.yml

@@ -0,0 +1,17 @@
+deezer_arl: !vault |
+  $ANSIBLE_VAULT;1.1;AES256
+  30376434343866323037636662633839313731316533636463383031353462346337626337376563
+  3334356436383831353265663266666631356131386139310a333066363932643363386139396437
+  62333561623365336163663062663035383335336465333031306165633539343663333462313362
+  6634396266386466340a336162626636633531363738353561363030316133386163316135613538
+  64326563336665333566616163366263663763313764613636643931393862333166333332323139
+  65653234663836346538636264613637346662636566666364393165313863333939326538663632
+  38363438356234363639373162633762383139373838376137366333663166326165616663393039
+  34343863666163393164653937663931626434626562306333313665306332313865636462613030
+  36343930323861366235636535646662643561666663656165303031346631396239623531386365
+  39633063363934316637663139396461326533626362363730613562306163663163306665623233
+  38323763653064303631303566653736333237643031626266343036333938636635653132636661
+  64636438653933363335343431383162366636393834396639363266653963316431333138353638
+  61656535363734303139323964303336353032663635366131313866373033666662393130393132
+  3637393263373761646366376532613761613039633465633432
+

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

@@ -1,28 +0,0 @@
-version: "{{ docker_compose_version }}"
-
-networks:
-  traefik:
-    external: true
-
-services:
-  lubelogger:
-    container_name: lubelogger
-    image: ghcr.io/hargata/lubelogger:latest
-    restart: unless-stopped
-    networks:
-      - traefik
-    environment:
-      - LC_ALL=en_US.UTF-8
-      - LANG=en_US.UTF-8
-      - MailConfig__EmailServer=""
-      - MailConfig__EmailFrom=""
-      - MailConfig__Port=587
-      - MailConfig__Username=""
-      - MailConfig__Password=""
-      - LOGGING__LOGLEVEL__DEFAULT=Error
-    volumes:
-      - "{{ data_dir }}/{{ role_name }}:/App"
-    labels:
-      traefik.enable: true
-      traefik.http.routers.lubelogger.rule: "Host(`lubelogger.local.{{ personal_domain }}`)"
-      traefik.http.routers.lubelogger.middlewares: lan-whitelist@file

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

@@ -1,67 +0,0 @@
-version: "{{ docker_compose_version }}"
-
-networks:
-  traefik:
-    external: true
-  default:
-    internal: true
-
-services:
-  mealie-frontend:
-    image: hkotel/mealie:frontend-v1.0.0beta-5
-    container_name: mealie-frontend
-    restart: unless-stopped
-    depends_on:
-      - mealie-api
-    networks:
-      - default
-      - traefik
-    environment:
-      - API_URL=http://mealie-api:9000 # 
-    volumes:
-      - "{{ data_dir }}/mealie:/app/data"
-    labels:
-      traefik.enable: true
-      traefik.http.routers.mealie.rule: "Host(`mealie.{{ personal_domain }}`)"
-      traefik.http.services.mealie.loadbalancer.server.port: 3000
-
-  mealie-api:
-    image: hkotel/mealie:api-v1.0.0beta-5
-    container_name: mealie-api
-    restart: unless-stopped
-    depends_on:
-      - postgres
-    networks:
-      - default
-    volumes:
-      - "{{ data_dir }}/mealie:/app/data"
-    environment:
-      - ALLOW_SIGNUP=false
-      - "PUID={{ service_user.uid }}"
-      - "PGID={{ service_user.uid }}"
-      - "TZ={{ timezone }}"
-      - MAX_WORKERS=1
-      - WEB_CONCURRENCY=1
-      - "BASE_URL=https://mealie.{{ personal_domain }}"
-      - DB_ENGINE=postgres
-      - POSTGRES_USER=mealie
-      - POSTGRES_PASSWORD=mealie
-      - POSTGRES_SERVER=postgres
-      - POSTGRES_PORT=5432
-      - POSTGRES_DB=mealie
-      - "DEFAULT_EMAIL={{ email }}"
-      - TOKEN_TIME=168
-    dns:
-      - 10.0.0.1
-
-  postgres:
-    container_name: postgres
-    image: postgres
-    restart: always
-    networks:
-      - default
-    volumes:
-      - "{{ data_dir }}/postgres/mealie:/var/lib/postgresql/data"
-    environment:
-      POSTGRES_PASSWORD: mealie
-      POSTGRES_USER: mealie

ansible/roles/mealie/vars/main.yml

@@ -1,7 +0,0 @@
-email: !vault |
-  $ANSIBLE_VAULT;1.1;AES256
-  30343965383433393930313337303637353362616563313863396433323939393864393436376534
-  6438663537386464623830316136643461356631316436360a636664323436303464376630616639
-  62653263633531343733313137303863623562616632313236376466313132636234633438616164
-  3030303934343761390a663734333566323234613434633636353665623530643262353162383237
-  66633863376332663064346132356238333561663438643232646463646632656361

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

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

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

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

ansible/roles/ntfy/handlers/main.yml

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

ansible/roles/ntfy/tasks/main.yml

@@ -1,31 +0,0 @@
-- name: Create install directory
-  file:
-    path: "{{ install_directory }}/{{ role_name }}"
-    state: directory
-    owner: "{{ docker_user }}"
-    mode: "{{ docker_compose_directory_mask }}"
-  become: true
-
-- name: Copy docker-compose file to destination
-  template:
-    src: docker-compose.yml
-    dest: "{{ install_directory }}/{{ role_name }}/docker-compose.yml"
-    owner: "{{ docker_user }}"
-    mode: "{{ docker_compose_file_mask }}"
-    validate: docker compose -f %s config
-  become: true
-
-- name: Install configuration file
-  template:
-    src: server.yml
-    dest: "{{ data_dir }}/ntfy/server.yml"
-    owner: "{{ docker_user }}"
-    mode: "{{ docker_compose_file_mask }}"
-  notify: restart ntfy
-  become: true
-
-- name: Start docker container
-  community.docker.docker_compose_v2:
-    project_src: "{{ install_directory }}/{{ role_name }}"
-    pull: always
-    remove_orphans: yes

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

@@ -1,25 +0,0 @@
-version: "{{ docker_compose_version }}"
-
-networks:
-  traefik:
-    external: true
-
-services:
-  ntfy:
-    container_name: ntfy
-    image: binwiederhier/ntfy:latest
-    restart: unless-stopped
-    networks:
-      - traefik
-    user: "{{ primary_uid }}:{{ primary_gid }}"
-    environment:
-      - TZ={{ timezone }}
-    command:
-      - serve
-    volumes:
-      - "{{ data_dir }}/ntfy:/etc/ntfy"
-      - /var/cache/ntfy:/var/cache/ntfy
-    labels:
-      traefik.enable: true
-      traefik.http.routers.ntfy.rule: "Host(`push.{{ personal_domain }}`)"
-      traefik.http.routers.ntfy.middlewares: lan-whitelist@file

ansible/roles/ntfy/templates/server.yml

@@ -1,279 +0,0 @@
-# ntfy server config file
-#
-# Please refer to the documentation at https://ntfy.sh/docs/config/ for details.
-# All options also support underscores (_) instead of dashes (-) to comply with the YAML spec.
-
-# Public facing base URL of the service (e.g. https://ntfy.sh or https://ntfy.example.com)
-#
-# This setting is required for any of the following features:
-# - attachments (to return a download URL)
-# - e-mail sending (for the topic URL in the email footer)
-# - iOS push notifications for self-hosted servers (to calculate the Firebase poll_request topic)
-# - Matrix Push Gateway (to validate that the pushkey is correct)
-#
-base-url: "https://push.{{ personal_domain }}"
-
-# Listen address for the HTTP & HTTPS web server. If "listen-https" is set, you must also
-# set "key-file" and "cert-file". Format: [<ip>]:<port>, e.g. "1.2.3.4:8080".
-#
-# To listen on all interfaces, you may omit the IP address, e.g. ":443".
-# To disable HTTP, set "listen-http" to "-".
-#
-# listen-http: ":80"
-# listen-https:
-
-# Listen on a Unix socket, e.g. /var/lib/ntfy/ntfy.sock
-# This can be useful to avoid port issues on local systems, and to simplify permissions.
-#
-# listen-unix: <socket-path>
-# listen-unix-mode: <linux permissions, e.g. 0700>
-
-# Path to the private key & cert file for the HTTPS web server. Not used if "listen-https" is not set.
-#
-# key-file: <filename>
-# cert-file: <filename>
-
-# If set, also publish messages to a Firebase Cloud Messaging (FCM) topic for your app.
-# This is optional and only required to save battery when using the Android app.
-#
-# firebase-key-file: <filename>
-
-# If "cache-file" is set, messages are cached in a local SQLite database instead of only in-memory.
-# This allows for service restarts without losing messages in support of the since= parameter.
-#
-# The "cache-duration" parameter defines the duration for which messages will be buffered
-# before they are deleted. This is required to support the "since=..." and "poll=1" parameter.
-# To disable the cache entirely (on-disk/in-memory), set "cache-duration" to 0.
-# The cache file is created automatically, provided that the correct permissions are set.
-#
-# The "cache-startup-queries" parameter allows you to run commands when the database is initialized,
-# e.g. to enable WAL mode (see https://phiresky.github.io/blog/2020/sqlite-performance-tuning/)).
-# Example:
-#    cache-startup-queries: |
-#       pragma journal_mode = WAL;
-#       pragma synchronous = normal;
-#       pragma temp_store = memory;
-#       pragma busy_timeout = 15000;
-#       vacuum;
-#
-# The "cache-batch-size" and "cache-batch-timeout" parameter allow enabling async batch writing
-# of messages. If set, messages will be queued and written to the database in batches of the given
-# size, or after the given timeout. This is only required for high volume servers.
-#
-# Debian/RPM package users:
-#   Use /var/cache/ntfy/cache.db as cache file to avoid permission issues. The package
-#   creates this folder for you.
-#
-# Check your permissions:
-#   If you are running ntfy with systemd, make sure this cache file is owned by the
-#   ntfy user and group by running: chown ntfy.ntfy <filename>.
-#
-# cache-file: <filename>
-# cache-duration: "12h"
-# cache-startup-queries:
-# cache-batch-size: 0
-# cache-batch-timeout: "0ms"
-
-# If set, access to the ntfy server and API can be controlled on a granular level using
-# the 'ntfy user' and 'ntfy access' commands. See the --help pages for details, or check the docs.
-#
-# - auth-file is the SQLite user/access database; it is created automatically if it doesn't already exist
-# - auth-default-access defines the default/fallback access if no access control entry is found; it can be
-#   set to "read-write" (default), "read-only", "write-only" or "deny-all".
-# - auth-startup-queries allows you to run commands when the database is initialized, e.g. to enable
-#   WAL mode. This is similar to cache-startup-queries. See above for details.
-#
-# Debian/RPM package users:
-#   Use /var/lib/ntfy/user.db as user database to avoid permission issues. The package
-#   creates this folder for you.
-#
-# Check your permissions:
-#   If you are running ntfy with systemd, make sure this user database file is owned by the
-#   ntfy user and group by running: chown ntfy.ntfy <filename>.
-#
-# auth-file: <filename>
-# auth-default-access: "read-write"
-# auth-startup-queries:
-
-# If set, the X-Forwarded-For header is used to determine the visitor IP address
-# instead of the remote address of the connection.
-#
-# WARNING: If you are behind a proxy, you must set this, otherwise all visitors are rate limited
-#          as if they are one.
-#
-behind-proxy: true
-
-# If enabled, clients can attach files to notifications as attachments. Minimum settings to enable attachments
-# are "attachment-cache-dir" and "base-url".
-#
-# - attachment-cache-dir is the cache directory for attached files
-# - attachment-total-size-limit is the limit of the on-disk attachment cache directory (total size)
-# - attachment-file-size-limit is the per-file attachment size limit (e.g. 300k, 2M, 100M)
-# - attachment-expiry-duration is the duration after which uploaded attachments will be deleted (e.g. 3h, 20h)
-#
-attachment-cache-dir: "/var/cache/ntfy/attachments"
-# attachment-total-size-limit: "5G"
-# attachment-file-size-limit: "15M"
-# attachment-expiry-duration: "3h"
-
-# If enabled, allow outgoing e-mail notifications via the 'X-Email' header. If this header is set,
-# messages will additionally be sent out as e-mail using an external SMTP server. As of today, only
-# SMTP servers with plain text auth and STARTLS are supported. Please also refer to the rate limiting settings
-# below (visitor-email-limit-burst & visitor-email-limit-burst).
-#
-# - smtp-sender-addr is the hostname:port of the SMTP server
-# - smtp-sender-user/smtp-sender-pass are the username and password of the SMTP user
-# - smtp-sender-from is the e-mail address of the sender
-#
-# smtp-sender-addr:
-# smtp-sender-user:
-# smtp-sender-pass:
-# smtp-sender-from:
-
-# If enabled, ntfy will launch a lightweight SMTP server for incoming messages. Once configured, users can send
-# emails to a topic e-mail address to publish messages to a topic.
-#
-# - smtp-server-listen defines the IP address and port the SMTP server will listen on, e.g. :25 or 1.2.3.4:25
-# - smtp-server-domain is the e-mail domain, e.g. ntfy.sh
-# - smtp-server-addr-prefix is an optional prefix for the e-mail addresses to prevent spam. If set to "ntfy-",
-#   for instance, only e-mails to ntfy-$topic@ntfy.sh will be accepted. If this is not set, all emails to
-#   $topic@ntfy.sh will be accepted (which may obviously be a spam problem).
-#
-# smtp-server-listen:
-# smtp-server-domain:
-# smtp-server-addr-prefix:
-
-# Interval in which keepalive messages are sent to the client. This is to prevent
-# intermediaries closing the connection for inactivity.
-#
-# Note that the Android app has a hardcoded timeout at 77s, so it should be less than that.
-#
-# keepalive-interval: "45s"
-
-# Interval in which the manager prunes old messages, deletes topics
-# and prints the stats.
-#
-# manager-interval: "1m"
-
-# Defines topic names that are not allowed, because they are otherwise used. There are a few default topics
-# that cannot be used (e.g. app, account, settings, ...). To extend the default list, define them here.
-#
-# Example:
-#   disallowed-topics:
-#     - about
-#     - pricing
-#     - contact
-#
-# disallowed-topics:
-
-# Defines if the root route (/) is pointing to the landing page (as on ntfy.sh) or the
-# web app. If you self-host, you don't want to change this.
-# Can be "app" (default), "home" or "disable" to disable the web app entirely.
-#
-# web-root: app
-
-# Various feature flags used to control the web app, and API access, mainly around user and
-# account management.
-#
-# - enable-signup allows users to sign up via the web app, or API
-# - enable-login allows users to log in via the web app, or API
-# - enable-reservations allows users to reserve topics (if their tier allows it)
-#
-# enable-signup: false
-# enable-login: false
-# enable-reservations: false
-
-# Server URL of a Firebase/APNS-connected ntfy server (likely "https://ntfy.sh").
-#
-# iOS users:
-#   If you use the iOS ntfy app, you MUST configure this to receive timely notifications. You'll like want this:
-#   upstream-base-url: "https://ntfy.sh"
-#
-# If set, all incoming messages will publish a "poll_request" message to the configured upstream server, containing
-# the message ID of the original message, instructing the iOS app to poll this server for the actual message contents.
-# This is to prevent the upstream server and Firebase/APNS from being able to read the message.
-#
-# upstream-base-url:
-
-# Rate limiting: Total number of topics before the server rejects new topics.
-#
-# global-topic-limit: 15000
-
-# Rate limiting: Number of subscriptions per visitor (IP address)
-#
-# visitor-subscription-limit: 30
-
-# Rate limiting: Allowed GET/PUT/POST requests per second, per visitor:
-# - visitor-request-limit-burst is the initial bucket of requests each visitor has
-# - visitor-request-limit-replenish is the rate at which the bucket is refilled
-# - visitor-request-limit-exempt-hosts is a comma-separated list of hostnames, IPs or CIDRs to be
-#   exempt from request rate limiting. Hostnames are resolved at the time the server is started.
-#   Example: "1.2.3.4,ntfy.example.com,8.7.6.0/24"
-#
-# visitor-request-limit-burst: 60
-# visitor-request-limit-replenish: "5s"
-# visitor-request-limit-exempt-hosts: ""
-
-# Rate limiting: Hard daily limit of messages per visitor and day. The limit is reset
-# every day at midnight UTC. If the limit is not set (or set to zero), the request
-# limit (see above) governs the upper limit.
-#
-# visitor-message-daily-limit: 0
-
-# Rate limiting: Allowed emails per visitor:
-# - visitor-email-limit-burst is the initial bucket of emails each visitor has
-# - visitor-email-limit-replenish is the rate at which the bucket is refilled
-#
-# visitor-email-limit-burst: 16
-# visitor-email-limit-replenish: "1h"
-
-# Rate limiting: Attachment size and bandwidth limits per visitor:
-# - visitor-attachment-total-size-limit is the total storage limit used for attachments per visitor
-# - visitor-attachment-daily-bandwidth-limit is the total daily attachment download/upload traffic limit per visitor
-#
-# visitor-attachment-total-size-limit: "100M"
-# visitor-attachment-daily-bandwidth-limit: "500M"
-
-# Payments integration via Stripe
-#
-# - stripe-secret-key is the key used for the Stripe API communication. Setting this values
-#   enables payments in the ntfy web app (e.g. Upgrade dialog). See https://dashboard.stripe.com/apikeys.
-# - stripe-webhook-key is the key required to validate the authenticity of incoming webhooks from Stripe.
-#   Webhooks are essential up keep the local database in sync with the payment provider. See https://dashboard.stripe.com/webhooks.
-#
-# stripe-secret-key:
-# stripe-webhook-key:
-
-# Logging options
-#
-# By default, ntfy logs to the console (stderr), with an "info" log level, and in a human-readable text format.
-# ntfy supports five different log levels, can also write to a file, log as JSON, and even supports granular
-# log level overrides for easier debugging. Some options (log-level and log-level-overrides) can be hot reloaded
-# by calling "kill -HUP $pid" or "systemctl reload ntfy".
-#
-# - log-format defines the output format, can be "text" (default) or "json"
-# - log-file is a filename to write logs to. If this is not set, ntfy logs to stderr.
-# - log-level defines the default log level, can be one of "trace", "debug", "info" (default), "warn" or "error".
-#   Be aware that "debug" (and particularly "trace") can be VERY CHATTY. Only turn them on briefly for debugging purposes.
-# - log-level-overrides lets you override the log level if certain fields match. This is incredibly powerful
-#   for debugging certain parts of the system (e.g. only the account management, or only a certain visitor).
-#   This is an array of strings in the format:
-#      - "field=value -> level" to match a value exactly, e.g. "tag=manager -> trace"
-#      - "field -> level" to match any value, e.g. "time_taken_ms -> debug"
-#   Warning: Using log-level-overrides has a performance penalty. Only use it for temporary debugging.
-#
-# Example (good for production):
-#   log-level: info
-#   log-format: json
-#   log-file: /var/log/ntfy.log
-#
-# Example level overrides (for debugging, only use temporarily):
-#   log-level-overrides:
-#      - "tag=manager -> trace"
-#      - "visitor_ip=1.2.3.4 -> debug"
-#      - "time_taken_ms -> debug"
-#
-# log-level: info
-# log-level-overrides:
-# log-format: text
-# log-file:

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

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

ansible/roles/qbittorrent/handlers/main.yml

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

ansible/roles/qbittorrent/tasks/main.yml

@@ -30,7 +30,6 @@
     dest: "{{ data_dir }}/qbitmanage/config.yml"
     owner: "{{ service_user.uid }}"
     mode: "{{ docker_compose_file_mask }}"
-  notify: restart qbittorrent
   become: true
 
 - name: Create cross-seed config directory
@@ -47,7 +46,6 @@
     dest: "{{ data_dir }}/cross-seed/config.js"
     owner: "{{ service_user.uid }}"
     mode: "{{ docker_compose_file_mask }}"
-  notify: restart qbittorrent
   become: true
 
 - name: Start docker containers

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

@@ -4,17 +4,23 @@ module.exports = {
     delay: 30,
 
     torznab: [
-	    "http://prowlarr.local.{{ personal_domain }}/1/api?apikey={{ prowlarr_api_key }}", // TorrentLeech
-	    "http://prowlarr.local.{{ personal_domain }}/3/api?apikey={{ prowlarr_api_key }}", // ImmortalSeed
-	    "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
 	    "http://prowlarr.local.{{ personal_domain }}/9/api?apikey={{ prowlarr_api_key }}", // LST
+	    "http://prowlarr.local.{{ personal_domain }}/10/api?apikey={{ prowlarr_api_key }}", // MyAnonaMouse
 	    "http://prowlarr.local.{{ personal_domain }}/12/api?apikey={{ prowlarr_api_key }}", // Blutopia
 	    "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 }}/19/api?apikey={{ prowlarr_api_key }}", // Cathode-Ray.Tube
+	    "http://prowlarr.local.{{ personal_domain }}/25/api?apikey={{ prowlarr_api_key }}", // seedpool
+	    "http://prowlarr.local.{{ personal_domain }}/27/api?apikey={{ prowlarr_api_key }}", // Upload.cx
+	    "http://prowlarr.local.{{ personal_domain }}/28/api?apikey={{ prowlarr_api_key }}", // AnimeBytes
+	    "http://prowlarr.local.{{ personal_domain }}/30/api?apikey={{ prowlarr_api_key }}", // DocsPedia
+	    "http://prowlarr.local.{{ personal_domain }}/31/api?apikey={{ prowlarr_api_key }}", // OnlyEncodes+
+	    "http://prowlarr.local.{{ personal_domain }}/32/api?apikey={{ prowlarr_api_key }}", // Anthelion
+	    "http://prowlarr.local.{{ personal_domain }}/33/api?apikey={{ prowlarr_api_key }}", // OldToonsWorld
+	    "http://prowlarr.local.{{ personal_domain }}/34/api?apikey={{ prowlarr_api_key }}", // Zenith
     ],
 
     outputDir: null,
@@ -24,8 +30,7 @@ module.exports = {
     excludeOlder: "12w",
     excludeRecentSearch: "3w",
     action: "inject",
-    rtorrentRpcUrl: undefined,
-    qbittorrentUrl: "https://qbittorrent.local.{{ personal_domain }}",
+    torrentClients: ["qbittorrent:https://qui.local.{{ personal_domain }}/proxy/{{ qui_crossseed_api_key }}"],
     sonarr: ["https://sonarr.local.{{ personal_domain }}/?apikey={{ sonarr_api_key }}"],
     radarr: ["https://radarr.local.{{ personal_domain }}/?apikey={{ radarr_api_key }}"],
     seasonsFromEpisodes: 0.8,
@@ -36,4 +41,7 @@ module.exports = {
     port: 2468,
     rssCadence: "16min",
     searchCadence: "1w",
+    blockList: [
+	    "category:upload",
+    ],
 };

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

@@ -1,5 +1,3 @@
-version: "{{ docker_compose_version }}"
-
 networks:
   starr:
     external: true
@@ -7,7 +5,7 @@ networks:
 services:
   qbittorrent:
     container_name: qbittorrent
-    image: lscr.io/linuxserver/qbittorrent:5.0.3
+    image: lscr.io/linuxserver/qbittorrent:5.2.3
     restart: unless-stopped
     network_mode: "container:gluetun"
     environment:
@@ -54,26 +52,3 @@ services:
       - "{{ media_storage_mnt }}/data/torrents:/data/torrents" # Necessary for partial matching
     command: daemon
     restart: unless-stopped
-
-  unpackerr:
-    container_name: unpackerr
-    image: ghcr.io/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"

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

@@ -5,11 +5,11 @@ commands:
   recheck: True
   tag_update: True
   rem_unregistered: True
-  remove_orphaned: True
+  rem_orphaned: True
   tag_nohardlinks: True
 
 qbt:
-  host: "https://qbittorrent.local.{{ personal_domain }}"
+  host: "https://qui.local.{{ personal_domain }}/proxy/{{ qui_qbitmanage_api_key }}"
   user:
   pass:
 
@@ -21,6 +21,8 @@ settings:
   tracker_error_tag: issue  # Will set the tag of any torrents that do not have a working tracker.
   nohardlinks_tag: noHL
   share_limits_tag: ~share_limit
+  share_limits_min_seeding_time_tag: MinSeedTimeNotReached
+
 directory:
   root_dir: /data/torrents
   torrents_dir: /torrents
@@ -39,42 +41,54 @@ cat:
 tracker:
   hawke:
     tag: HUNO
-  digitalcore:
-    tag: DigitalCore
   myanonamouse:
     tag: MaM
   torrentleech|tleechreload:
-    tag: TorrentLeech
+    tag: TL
   aither:
-    tag: Aither
+    tag: ATH
   nyaa:
     tag: Nyaa
   animetosho:
     tag: AnimeTosho
   immortalseed:
     tag: ImmortalSeed
-  torrentseeds:
-    tag: TorrentSeeds
   ops:
-    tag: Orpheus
+    tag: OPS
   reelflix:
-    tag: ReelFlix
+    tag: RFX
   blutopia:
-    tag: Blu
+    tag: BLU
   lst:
     tag: LST
   speed:
     tag: Speed.CD
   alpharatio:
-    tag: AlphaRatio
+    tag: AR
   filelist:
-    tag: FileList
+    tag: FL
   skipthecommericals.xyz:
     tag: STC
   cathode:
     tag: CRT
   t-ru.org:
     tag: rutracker
+  seedpool|seedpool.org:
+    tag: SP
+  upload.cx:
+    tag: ULCX
+  archlinux:
+    tag: archlinux
+  animebytes:
+    tag: AB
+  anthelion:
+    tag: ANT
+  onlyencodes:
+    tag: OE+
+  oldtoons:
+    tag: OTW
+  other:
+    tag: other
 
 nohardlinks:
   - movies
@@ -89,37 +103,24 @@ share_limits:
     priority: 1
     include_all_tags:
       - noHL
-    exclude_tags:
-      - cross-seed
-    max_ratio: 4.0
-    max_seeding_time: 28800 # 20 days
-    min_seeding_time: 10080 # 7 days
+    max_seeding_time: 40320 # 4 weeks
     cleanup: true
     add_group_to_tag: false
-  noHL.cross-seed:
-    priority: 2
-    include_all_tags:
-      - noHL
-      - cross-seed
-    max_ratio: 4.0
-    max_seeding_time: 28800 # 20 days
-    min_seeding_time: 0
-    cleanup: true
-    add_group_to_tag: false
-  public_trackers:
-    priority: 10
+  isos:
+    priority: 8
     include_any_tags:
-      - Nyaa
-      - AnimeTosho
-      - rutracker
-    categories:
-      - movies
-      - tv
-    max_ratio: 2
-    max_seeding_time: 21600 # 15 days
+      - archlinux
+    max_seeding_time: 129600 # 90 days
     cleanup: true
     add_group_to_tag: false
-
+  big: # Set speed limit on bandwidth hogs
+    priority: 9
+    include_any_tags:
+      - TorrentLeech
+      - FileList
+      - AlphaRatio
+    limit_upload_speed: 100 # 100 KiBps
+    add_group_to_tag: false
 
 recyclebin:
   enabled: true

ansible/roles/qbittorrent/vars/main.yml

@@ -33,3 +33,25 @@ crossseed_webhook_endpoint: !vault |
   37633631313965396233613333373832353463653337393861393335373661393163343037306130
   6337376662653463316530313863613532633338623731356536
 
+qui_crossseed_api_key: !vault |
+  $ANSIBLE_VAULT;1.1;AES256
+  31663334373665646433616663326336306631653833373765366463373166316661333463316235
+  3861633161623034356431383030326233353836656466390a386534356665633561376263363030
+  63383766383535366530306238393836613337366136363037313364336164383366636166623265
+  3964366637613866300a653231333566356566616537356330613938353464303530616232306238
+  32666665653534653765653034396232663161323261623237373739333634383038346562613063
+  65653332666336613861363965393562366465666261666536396231303461656162373436633830
+  63326536613230626563626232363835373635323533333332373136356430393439316666386439
+  65356230376630376630
+
+qui_qbitmanage_api_key: !vault |
+  $ANSIBLE_VAULT;1.1;AES256
+  39616437313930376137323434396438333562316565306233316166383465333134623836633365
+  6136333039373366396461356665333236326539323731380a653664656637313933346533396433
+  33643430343437623132666233383434613066346338646232666539633066333662343565336466
+  3031323265343936660a366265313430663330643132373233383765633066396566343963663662
+  61386365653233366237363062336539653361373930383530653031656638356533313061626635
+  33663932666536396431626363623437326133646661653834376335373562353065323633326234
+  33316338653865326534336530656231643830616434396637306561376436633632343731623065
+  37343434326461346465
+

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

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

ansible/roles/readarr/tasks/main.yml

@@ -1,31 +0,0 @@
-- name: Create service user
-  user:
-    name: "{{ role_name }}"
-    groups: "{{ media_group }}"
-    append: yes
-    system: true
-  register: service_user
-  become: true
-
-- name: Create install directory
-  file:
-    path: "{{ install_directory }}/{{ role_name }}"
-    state: directory
-    owner: "{{ docker_user }}"
-    mode: "{{ docker_compose_directory_mask }}"
-  become: true
-
-- name: Copy docker-compose file to destination
-  template:
-    src: docker-compose.yml
-    dest: "{{ install_directory }}/{{ role_name }}/docker-compose.yml"
-    owner: "{{ docker_user }}"
-    mode: "{{ docker_compose_file_mask }}"
-    validate: docker compose -f %s config
-  become: true
-
-- name: Start docker container
-  community.docker.docker_compose_v2:
-    project_src: "{{ install_directory }}/{{ role_name }}"
-    pull: always
-    remove_orphans: yes

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

@@ -1,25 +0,0 @@
-version: "{{ docker_compose_version }}"
-
-networks:
-  traefik:
-    external: true
-
-services:
-  {{ role_name }}:
-    container_name: "{{ role_name }}"
-    image: cr.hotio.dev/hotio/readarr
-    restart: unless-stopped
-    networks:
-      - traefik
-    environment:
-      - "PUID={{ service_user.uid }}"
-      - "PGID={{ media_gid }}"
-      - "TZ={{ timezone }}"
-      - "UMASK=002"
-    volumes:
-      - "{{ data_dir }}/{{ role_name }}:/config"
-      - "{{ media_storage_mnt }}/data:/data"
-    labels:
-      traefik.enable: true
-      traefik.http.routers.{{ role_name }}.rule: "Host(`{{ role_name }}.local.{{ personal_domain }}`)"
-      traefik.http.routers.{{ role_name }}.middlewares: lan-whitelist@file

ansible/roles/recyclarr/files/includes/radarr-anime-custom_formats.yml

@@ -1,12 +1,13 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/recyclarr/recyclarr/master/schemas/config-schema.json
 custom_formats:
   - trash_ids:
-      # HQ Anime Release Groups
+      # HQ Release Groups
       - fb3ccc5d5cc8f77c9055d4cb4561dded # Anime BD Tier 01 (Top SeaDex Muxers)
       - 66926c8fa9312bc74ab71bf69aae4f4a # Anime BD Tier 02 (SeaDex Muxers)
       - fa857662bad28d5ff21a6e611869a0ff # Anime BD Tier 03 (SeaDex Muxers)
       - f262f1299d99b1a2263375e8fa2ddbb3 # Anime BD Tier 04 (SeaDex Muxers)
       - ca864ed93c7b431150cc6748dc34875d # Anime BD Tier 05 (Remuxes)
-      - 9dce189b960fddf47891b7484ee886ca # Anime BD Tier 06 (FanSubs)
+      - 9dce189b960fddf47891b7484ee886ca # Anime BD tier 06 (FanSubs)
       - 1ef101b3a82646b40e0cab7fc92cd896 # Anime BD Tier 07 (P2P/Scene)
       - 6115ccd6640b978234cc47f2c1f2cadc # Anime BD Tier 08 (Mini Encodes)
       - 8167cffba4febfb9a6988ef24f274e7e # Anime Web Tier 01 (Muxers)
@@ -14,58 +15,42 @@ custom_formats:
       - de41e72708d2c856fa261094c85e965d # Anime Web Tier 03 (Official Subs)
       - 9edaeee9ea3bcd585da9b7c0ac3fc54f # Anime Web Tier 04 (Official Subs)
       - 22d953bbe897857b517928f3652b8dd3 # Anime Web Tier 05 (FanSubs)
-      - a786fbc0eae05afe3bb51aee3c83a9d4 # Anime Web Tier 06 (FanSubs)
+      - a786fbc0eae05afe3bb51aee3c83a9d4 # Anime Web tier 06 (FanSubs)
+      - 3a3ff47579026e76d6504ebea39390de # Remux Tier 01
+      - 9f98181fe5a3fbeb0cc29340da2a468a # Remux Tier 02
+      - 8baaf0b3142bf4d94c42a724f034e27a # Remux Tier 03
+      - c20f169ef63c5f40c2def54abaf4438e # WEB Tier 01
+      - 403816d65392c79236dcb6dd591aeda4 # WEB Tier 02
+      - af94e0fe497124d1f9ce732069ec8c3b # WEB Tier 03
 
-      # Anime Streaming Services
-      - 60f6d50cbd3cfc3e9a8c00e3a30c3114 # VRV
+      # Miscellaneous
+      - d4e5e842fad129a3c097bdb2d20d31a0 # VRV
+      - a5d148168c4506b55cf53984107c396e # 10bit
 
-      # Misc
-      - c259005cbaeb5ab44c06eddb4751e70c # v0
+      # Movie Versions
       - 5f400539421b8fcf71d51e6384434573 # v1
       - 3df5e6dfef4b09bb6002f732bed5b774 # v2
       - db92c27ba606996b146b57fbe6d09186 # v3
       - d4e5e842fad129a3c097bdb2d20d31a0 # v4
-      - a5d148168c4506b55cf53984107c396e # 10bit
 
       # Unwanted
-      - b0fdc5897f68c9a68c70c25169f77447 # Anime LQ Groups
       - 06b6542a47037d1e33b15aa3677c2365 # Anime Raws
-      - 9172b2f683f6223e3a1846427b417a3d # VOSTFR
+      - b0fdc5897f68c9a68c70c25169f77447 # Anime LQ Groups
+      - c259005cbaeb5ab44c06eddb4751e70c # v0
       - b23eae459cc960816f2d6ba84af45055 # Dubs Only
-    quality_profiles:
+      - 9172b2f683f6223e3a1846427b417a3d # VOSTFR
+      - cae4ca30163749b891686f95532519bd # AV1
+    assign_scores_to:
       - name: Anime
 
-  - trash_ids: [3a3ff47579026e76d6504ebea39390de] # Remux Tier 01
-    quality_profiles:
+  - trash_ids:
+      - 4a3b087eea2ce012fcc1ce319259a3be # Anime Dual Audio
+    assign_scores_to:
       - name: Anime
-        score: 1050
-  - trash_ids: [9f98181fe5a3fbeb0cc29340da2a468a] # Remux Tier 02
-    quality_profiles:
-      - name: Anime
-        score: 1000
-  - trash_ids: [8baaf0b3142bf4d94c42a724f034e27a] # Remux Tier 03
-    quality_profiles:
-      - name: Anime
-        score: 950
-  - trash_ids: [c20f169ef63c5f40c2def54abaf4438e] # WEB Tier 01
-    quality_profiles:
-      - name: Anime
-        score: 350
-  - trash_ids: [403816d65392c79236dcb6dd591aeda4] # WEB Tier 02
-    quality_profiles:
-      - name: Anime
-        score: 250
-  - trash_ids: [af94e0fe497124d1f9ce732069ec8c3b] # WEB Tier 03
-    quality_profiles:
-      - name: Anime
-        score: 150
+        score: 10 # Prefer dual audio within the same tier but not over higher quality releases 
 
-  - trash_ids: [4a3b087eea2ce012fcc1ce319259a3be] # Anime Dual Audio
-    quality_profiles:
+  - trash_ids:
+      - 923b6abef9b17f937fab56cfcf89e1f1 # DV (w/o HDR fallback)
+    assign_scores_to:
       - name: Anime
-        score: 101
-
-  - trash_ids: [064af5f084a0a24458cc8ecd3220f93f] # Uncensored
-    quality_profiles:
-      - name: Anime
-        score: 10
+        score: -10000

ansible/roles/recyclarr/files/includes/radarr-anime-qualities.yml

@@ -1,33 +1,38 @@
 quality_profiles:
   - name: Anime
-    reset_unmatched_scores:
-      enabled: true
     upgrade:
       allowed: true
-      until_quality: Bluray 1080p
+      until_quality: 'Bluray 2160p'
       until_score: 10000
     min_format_score: 0
+    score_set: anime-radarr
+    quality_sort: top
     qualities:
-      - name: Bluray 1080p
+      - name: 'Bluray 2160p'
+        qualities:
+          - Remux-2160p
+          - Bluray-2160p
+      - name: 'Bluray 1080p'
         qualities:
           - Remux-1080p
           - Bluray-1080p
+      - name: 'WEB 2160p'
+        qualities:
+          - WEBDL-2160p
+          - WEBRip-2160p
       - name: WEB 1080p
         qualities:
           - WEBDL-1080p
           - WEBRip-1080p
-          - HDTV-1080p
       - name: Bluray-720p
-      - name: WEB 720p
+      - name: 'WEB 720p'
         qualities:
           - WEBDL-720p
           - WEBRip-720p
           - HDTV-720p
       - name: Bluray-576p
       - name: Bluray-480p
-      - name: WEB 480p
+      - name: 'WEB 480p'
         qualities:
           - WEBDL-480p
           - WEBRip-480p
-      - name: DVD
-      - name: SDTV

ansible/roles/recyclarr/files/includes/radarr-encode-custom_formats.yml

@@ -0,0 +1,80 @@
+custom_formats:
+  - trash_ids:
+      # HDR Formats
+      - c53085ddbd027d9624b320627748612f # DV HDR10+
+      - e23edd2482476e595fb990b12e7c609c # DV HDR10
+      - 58d6a88f13e2db7f5059c41047876f00 # DV
+      - 55d53828b9d81cbe20b02efd00aa0efd # DV HLG
+      - a3e19f8f627608af0211acd02bf89735 # DV SDR
+      - b974a6cd08c1066250f1f177d7aa1225 # HDR10+
+      - dfb86d5941bc9075d6af23b09c2aeecd # HDR10
+      - e61e28db95d22bedcadf030b8f156d96 # HDR
+      - 2a4d9069cc1fe3242ff9bdaebed239bb # HDR (undefined)
+      - 08d6d8834ad9ec87b1dc7ec8148e7a1f # PQ
+      - 9364dd386c9b4a1100dde8264690add7 # HLG
+
+      # HQ Release Groups
+      - 4d74ac4c4db0b64bff6ce0cffef99bf0 # UHD Bluray Tier 01
+      - a58f517a70193f8e578056642178419d # UHD Bluray Tier 02
+      - e71939fae578037e7aed3ee219bbe7c1 # UHD Bluray Tier 03
+      - ed27ebfef2f323e964fb1f61391bcb35 # HD Bluray Tier 01
+      - c20c8647f2746a1f4c4262b0fbbeeeae # HD Bluray Tier 02
+      - 5608c71bcebba0a5e666223bae8c9227 # HD Bluray Tier 03
+      - c20f169ef63c5f40c2def54abaf4438e # WEB Tier 01
+      - 403816d65392c79236dcb6dd591aeda4 # WEB Tier 02
+      - af94e0fe497124d1f9ce732069ec8c3b # WEB Tier 03
+
+      # General Streaming Services
+      - b3b3a6ac74ecbd56bcdbefa4799fb9df # AMZN
+      - 40e9380490e748672c2522eaaeb692f7 # ATVP
+      - cc5e51a9e85a6296ceefe097a77f12f4 # BCORE
+      - 16622a6911d1ab5d5b8b713d5b0036d4 # CRiT
+      - 84272245b2988854bfb76a16e60baea5 # DSNP
+      - 509e5f41146e278f9eab1ddaceb34515 # HBO
+      - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX
+      - 526d445d4c16214309f0fd2b3be18a89 # Hulu
+      - e0ec9672be6cac914ffad34a6b077209 # iT
+      - 6a061313d22e51e0f25b7cd4dc065233 # MAX
+      - 2a6039655313bf5dab1e43523b62c374 # MA
+      - 170b1d363bd8516fbf3a3eb05d4faff6 # NF
+      - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP
+      - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK
+      - c2863d2a50c9acad1fb50e53ece60817 # STAN
+
+      # Movie Versions
+      - 570bc9ebecd92723d2d21500f4be314c # Remaster
+      - eca37840c13c6ef2dd0262b141a5482f # 4K Remaster
+      - e0c07d59beb37348e975a930d5e50319 # Criterion Collection
+      - 9d27d9d2181838f76dee150882bdc58c # Masters of Cinema
+      - db9b4c4b53d312a3ca5f1378f6440fc9 # Vinegar Syndrome
+      - 957d0f44b592285f26449575e8b1167e # Special Edition
+      - eecf3a857724171f968a66cb5719e152 # IMAX
+      - 9f6cbff8cfe4ebbc1bde14c7b7bec0de # IMAX Enhanced
+      - 09d9dd29a0fc958f9796e65c2a8864b4 # Open Matte
+
+      # Miscellaneous
+      - e7718d7a3ce595f289bfee26adc178f5 # Repack/Proper
+      - ae43b294509409a6a13919dedd4764c4 # Repack2
+      - 5caaaa1c08c1742aa4342d8c4cc463f2 # Repack3
+      
+      # Unwanted
+      - 923b6abef9b17f937fab56cfcf89e1f1 # DV (WEBDL)
+      - ed38b889b31be83fda192888e2286d83 # BR-DISK
+      - e6886871085226c3da1830830146846c # Gererated Dynamic HDR
+      - 90a6f9a284dff5103f6346090e6280c8 # LQ
+      - e204b80c87be9497a8a6eaff48f72905 # LQ (Release Title)
+      - 839bea857ed2c0a8e084f3cbdbd65ecb # x265 (no HDR/DV)
+      - 25c12f78430a3a23413652cbd1d48d77 # SDR (no WEBDL)
+      - b8cd450cbfa689c0259a01d9e29ba3d6 # 3D
+      - bfd8eb01832d646a0a89c4deb46f8564 # Upscaled
+      - 0a3f082873eb454bde444150b70253cc # Extras
+      - 712d74cd88bceb883ee32f773656b1f5 # Sing-Along Versions
+      - cae4ca30163749b891686f95532519bd # AV1
+      - b6832f586342ef70d9c128d40c07b872 # Bad Dual Groups
+      - cc444569854e9de0b084ab2b8b1532b2 # Black and White Editions
+      - ae9b7c9ebde1f3bd336a8cbd1ec4c5e5 # No-RlsGroup
+      - 7357cf5161efbf8c4d5d0c30b4815ee2 # Obfuscated
+      - 5c44f52a8714fdd79bb4d98e2673be1f # Retags
+      - f537cf427b64c38c8e36298f657e4828 # Scene
+    assign_scores_to:
+      - name: Encode

ansible/roles/recyclarr/files/includes/radarr-encode-qualities.yml

@@ -1,19 +1,14 @@
 quality_profiles:
-  - name: Web
-    reset_unmatched_scores:
-      enabled: true
+  - name: Encode
     upgrade:
       allowed: true
-      until_quality: WEB 2160p
+      until_quality: Bluray-2160p
       until_score: 10000
     min_format_score: 0
+    score_set: default
+    quality_sort: top
     qualities:
-      - name: Remux-2160p
-        enabled: false
       - name: Bluray-2160p
-        enabled: false
-      - name: Remux-1080p
-        enabled: false
       - name: WEB 2160p
         qualities:
           - WEBDL-2160p
@@ -23,3 +18,5 @@ quality_profiles:
         qualities:
           - WEBDL-1080p
           - WEBRip-1080p
+      - name: Remux-2160p
+      - name: Remux-1080p

ansible/roles/recyclarr/files/includes/radarr-not_4k-custom_formats.yml

@@ -13,8 +13,35 @@ custom_formats:
       - 08d6d8834ad9ec87b1dc7ec8148e7a1f # PQ
       - 9364dd386c9b4a1100dde8264690add7 # HLG
 
+      # HQ Release Groups
+      - 3a3ff47579026e76d6504ebea39390de # Remux Tier 01
+      - 9f98181fe5a3fbeb0cc29340da2a468a # Remux Tier 02
+      - 8baaf0b3142bf4d94c42a724f034e27a # Remux Tier 03
+      - ed27ebfef2f323e964fb1f61391bcb35 # HD Bluray Tier 01
+      - c20c8647f2746a1f4c4262b0fbbeeeae # HD Bluray Tier 02
+      - 5608c71bcebba0a5e666223bae8c9227 # HD Bluray Tier 03
+      - c20f169ef63c5f40c2def54abaf4438e # WEB Tier 01
+      - 403816d65392c79236dcb6dd591aeda4 # WEB Tier 02
+      - af94e0fe497124d1f9ce732069ec8c3b # WEB Tier 03
+
+      # General Streaming Services
+      - b3b3a6ac74ecbd56bcdbefa4799fb9df # AMZN
+      - 40e9380490e748672c2522eaaeb692f7 # ATVP
+      - cc5e51a9e85a6296ceefe097a77f12f4 # BCORE
+      - 16622a6911d1ab5d5b8b713d5b0036d4 # CRiT
+      - 84272245b2988854bfb76a16e60baea5 # DSNP
+      - 509e5f41146e278f9eab1ddaceb34515 # HBO
+      - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX
+      - 526d445d4c16214309f0fd2b3be18a89 # Hulu
+      - e0ec9672be6cac914ffad34a6b077209 # iT
+      - 6a061313d22e51e0f25b7cd4dc065233 # MAX
+      - 2a6039655313bf5dab1e43523b62c374 # MA
+      - 170b1d363bd8516fbf3a3eb05d4faff6 # NF
+      - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP
+      - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK
+      - c2863d2a50c9acad1fb50e53ece60817 # STAN
+
       # Movie Versions
-      #- 0f12c086e289cf966fa5948eac571f44 # Hybrid
       - 570bc9ebecd92723d2d21500f4be314c # Remaster
       - eca37840c13c6ef2dd0262b141a5482f # 4K Remaster
       - e0c07d59beb37348e975a930d5e50319 # Criterion Collection
@@ -23,44 +50,31 @@ custom_formats:
       - 957d0f44b592285f26449575e8b1167e # Special Edition
       - eecf3a857724171f968a66cb5719e152 # IMAX
       - 9f6cbff8cfe4ebbc1bde14c7b7bec0de # IMAX Enhanced
+      - 09d9dd29a0fc958f9796e65c2a8864b4 # Open Matte
 
-      # HQ Release Groups
-      - c20f169ef63c5f40c2def54abaf4438e # WEB Tier 01
-      - 403816d65392c79236dcb6dd591aeda4 # WEB Tier 02
-      - af94e0fe497124d1f9ce732069ec8c3b # WEB Tier 03
-
-      # Misc
+      # Miscellaneous
       - e7718d7a3ce595f289bfee26adc178f5 # Repack/Proper
       - ae43b294509409a6a13919dedd4764c4 # Repack2
-
+      - 5caaaa1c08c1742aa4342d8c4cc463f2 # Repack3
+      
       # Unwanted
+      - 923b6abef9b17f937fab56cfcf89e1f1 # DV (WEBDL)
       - ed38b889b31be83fda192888e2286d83 # BR-DISK
+      - e6886871085226c3da1830830146846c # Gererated Dynamic HDR
       - 90a6f9a284dff5103f6346090e6280c8 # LQ
+      - e204b80c87be9497a8a6eaff48f72905 # LQ (Release Title)
+      - 839bea857ed2c0a8e084f3cbdbd65ecb # x265 (no HDR/DV)
+      - 25c12f78430a3a23413652cbd1d48d77 # SDR (no WEBDL)
       - b8cd450cbfa689c0259a01d9e29ba3d6 # 3D
       - bfd8eb01832d646a0a89c4deb46f8564 # Upscaled
       - 0a3f082873eb454bde444150b70253cc # Extras
-      - 839bea857ed2c0a8e084f3cbdbd65ecb # x265 (no HDR/DV)
-      - 25c12f78430a3a23413652cbd1d48d77 # SDR (no WEBDL)
-      - 923b6abef9b17f937fab56cfcf89e1f1 # DV (WEBDL)
-
-      # Streaming Services
-      - cc5e51a9e85a6296ceefe097a77f12f4 # BCORE
-      - 16622a6911d1ab5d5b8b713d5b0036d4 # CRiT
-      - 2a6039655313bf5dab1e43523b62c374 # MA
-      - b3b3a6ac74ecbd56bcdbefa4799fb9df # AMZN
-      - 40e9380490e748672c2522eaaeb692f7 # ATVP
-      - f6ff65b3f4b464a79dcc75950fe20382 # CRAV
-      - 84272245b2988854bfb76a16e60baea5 # DSNP
-      - 509e5f41146e278f9eab1ddaceb34515 # HBO
-      - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX
-      - 526d445d4c16214309f0fd2b3be18a89 # Hulu
-      - 6a061313d22e51e0f25b7cd4dc065233 # MAX
-      - 170b1d363bd8516fbf3a3eb05d4faff6 # NF
-      - fbca986396c5e695ef7b2def3c755d01 # OViD
-      - bf7e73dd1d85b12cc527dc619761c840 # Pathe
-      - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK
-      - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP
-      - c2863d2a50c9acad1fb50e53ece60817 # STAN
-
-    quality_profiles:
-      - name: Web
+      - 712d74cd88bceb883ee32f773656b1f5 # Sing-Along Versions
+      - cae4ca30163749b891686f95532519bd # AV1
+      - b6832f586342ef70d9c128d40c07b872 # Bad Dual Groups
+      - cc444569854e9de0b084ab2b8b1532b2 # Black and White Editions
+      - ae9b7c9ebde1f3bd336a8cbd1ec4c5e5 # No-RlsGroup
+      - 7357cf5161efbf8c4d5d0c30b4815ee2 # Obfuscated
+      - 5c44f52a8714fdd79bb4d98e2673be1f # Retags
+      - f537cf427b64c38c8e36298f657e4828 # Scene
+    assign_scores_to:
+      - name: 'Not 4k'

ansible/roles/recyclarr/files/includes/radarr-not_4k-qualities.yml

@@ -1,12 +1,12 @@
 quality_profiles:
-  - name: Not 4k
-    reset_unmatched_scores:
-      enabled: true
+  - name: 'Not 4k'
     upgrade:
       allowed: true
       until_quality: Remux-1080p
       until_score: 10000
     min_format_score: 0
+    score_set: default
+    quality_sort: top
     qualities:
       - name: Remux-1080p
       - name: Bluray-1080p

ansible/roles/recyclarr/files/includes/radarr-old-custom_formats.yml

@@ -1,55 +1,83 @@
 custom_formats:
   - trash_ids:
+      # HDR Formats
+      - c53085ddbd027d9624b320627748612f # DV HDR10+
+      - e23edd2482476e595fb990b12e7c609c # DV HDR10
+      - 58d6a88f13e2db7f5059c41047876f00 # DV
+      - 55d53828b9d81cbe20b02efd00aa0efd # DV HLG
+      - a3e19f8f627608af0211acd02bf89735 # DV SDR
+      - b974a6cd08c1066250f1f177d7aa1225 # HDR10+
+      - dfb86d5941bc9075d6af23b09c2aeecd # HDR10
+      - e61e28db95d22bedcadf030b8f156d96 # HDR
+      - 2a4d9069cc1fe3242ff9bdaebed239bb # HDR (undefined)
+      - 08d6d8834ad9ec87b1dc7ec8148e7a1f # PQ
+      - 9364dd386c9b4a1100dde8264690add7 # HLG
+
+      # HQ Release Groups
+      - 3a3ff47579026e76d6504ebea39390de # Remux Tier 01
+      - 9f98181fe5a3fbeb0cc29340da2a468a # Remux Tier 02
+      - 8baaf0b3142bf4d94c42a724f034e27a # Remux Tier 03
+      - 4d74ac4c4db0b64bff6ce0cffef99bf0 # UHD Bluray Tier 01
+      - a58f517a70193f8e578056642178419d # UHD Bluray Tier 02
+      - e71939fae578037e7aed3ee219bbe7c1 # UHD Bluray Tier 03
+      - ed27ebfef2f323e964fb1f61391bcb35 # HD Bluray Tier 01
+      - c20c8647f2746a1f4c4262b0fbbeeeae # HD Bluray Tier 02
+      - 5608c71bcebba0a5e666223bae8c9227 # HD Bluray Tier 03
+      - c20f169ef63c5f40c2def54abaf4438e # WEB Tier 01
+      - 403816d65392c79236dcb6dd591aeda4 # WEB Tier 02
+      - af94e0fe497124d1f9ce732069ec8c3b # WEB Tier 03
+
+      # General Streaming Services
+      - b3b3a6ac74ecbd56bcdbefa4799fb9df # AMZN
+      - 40e9380490e748672c2522eaaeb692f7 # ATVP
+      - cc5e51a9e85a6296ceefe097a77f12f4 # BCORE
+      - 16622a6911d1ab5d5b8b713d5b0036d4 # CRiT
+      - 84272245b2988854bfb76a16e60baea5 # DSNP
+      - 509e5f41146e278f9eab1ddaceb34515 # HBO
+      - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX
+      - 526d445d4c16214309f0fd2b3be18a89 # Hulu
+      - e0ec9672be6cac914ffad34a6b077209 # iT
+      - 6a061313d22e51e0f25b7cd4dc065233 # MAX
+      - 2a6039655313bf5dab1e43523b62c374 # MA
+      - 170b1d363bd8516fbf3a3eb05d4faff6 # NF
+      - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP
+      - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK
+      - c2863d2a50c9acad1fb50e53ece60817 # STAN
+
       # Movie Versions
       - 570bc9ebecd92723d2d21500f4be314c # Remaster
+      - eca37840c13c6ef2dd0262b141a5482f # 4K Remaster
       - e0c07d59beb37348e975a930d5e50319 # Criterion Collection
       - 9d27d9d2181838f76dee150882bdc58c # Masters of Cinema
       - db9b4c4b53d312a3ca5f1378f6440fc9 # Vinegar Syndrome
       - 957d0f44b592285f26449575e8b1167e # Special Edition
       - eecf3a857724171f968a66cb5719e152 # IMAX
       - 9f6cbff8cfe4ebbc1bde14c7b7bec0de # IMAX Enhanced
+      - 09d9dd29a0fc958f9796e65c2a8864b4 # Open Matte
 
-      # HQ Release Groups
-      - 3a3ff47579026e76d6504ebea39390de # Remux Tier 01
-      - 9f98181fe5a3fbeb0cc29340da2a468a # Remux Tier 02
-      - 8baaf0b3142bf4d94c42a724f034e27a # Remux Tier 03
-      - c20f169ef63c5f40c2def54abaf4438e # WEB Tier 01
-      - 403816d65392c79236dcb6dd591aeda4 # WEB Tier 02
-      - af94e0fe497124d1f9ce732069ec8c3b # WEB Tier 03
-      - ed27ebfef2f323e964fb1f61391bcb35 # HD Bluray Tier 01
-      - c20c8647f2746a1f4c4262b0fbbeeeae # HD Bluray Tier 02
-
-      # Misc
+      # Miscellaneous
       - e7718d7a3ce595f289bfee26adc178f5 # Repack/Proper
       - ae43b294509409a6a13919dedd4764c4 # Repack2
-
+      - 5caaaa1c08c1742aa4342d8c4cc463f2 # Repack3
+      
       # Unwanted
+      - 923b6abef9b17f937fab56cfcf89e1f1 # DV (WEBDL)
       - ed38b889b31be83fda192888e2286d83 # BR-DISK
+      - e6886871085226c3da1830830146846c # Gererated Dynamic HDR
       - 90a6f9a284dff5103f6346090e6280c8 # LQ
+      - e204b80c87be9497a8a6eaff48f72905 # LQ (Release Title)
+      - 839bea857ed2c0a8e084f3cbdbd65ecb # x265 (no HDR/DV)
+      - 25c12f78430a3a23413652cbd1d48d77 # SDR (no WEBDL)
       - b8cd450cbfa689c0259a01d9e29ba3d6 # 3D
       - bfd8eb01832d646a0a89c4deb46f8564 # Upscaled
       - 0a3f082873eb454bde444150b70253cc # Extras
-      - 839bea857ed2c0a8e084f3cbdbd65ecb # x265 (no HDR/DV)
-      - 25c12f78430a3a23413652cbd1d48d77 # SDR (no WEBDL)
-
-      # Streaming Services
-      - cc5e51a9e85a6296ceefe097a77f12f4 # BCORE
-      - 16622a6911d1ab5d5b8b713d5b0036d4 # CRiT
-      - 2a6039655313bf5dab1e43523b62c374 # MA
-      - b3b3a6ac74ecbd56bcdbefa4799fb9df # AMZN
-      - 40e9380490e748672c2522eaaeb692f7 # ATVP
-      - f6ff65b3f4b464a79dcc75950fe20382 # CRAV
-      - 84272245b2988854bfb76a16e60baea5 # DSNP
-      - 509e5f41146e278f9eab1ddaceb34515 # HBO
-      - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX
-      - 526d445d4c16214309f0fd2b3be18a89 # Hulu
-      - 6a061313d22e51e0f25b7cd4dc065233 # MAX
-      - 170b1d363bd8516fbf3a3eb05d4faff6 # NF
-      - fbca986396c5e695ef7b2def3c755d01 # OViD
-      - bf7e73dd1d85b12cc527dc619761c840 # Pathe
-      - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK
-      - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP
-      - c2863d2a50c9acad1fb50e53ece60817 # STAN
-
-    quality_profiles:
-      - name: Not 4k
+      - 712d74cd88bceb883ee32f773656b1f5 # Sing-Along Versions
+      - cae4ca30163749b891686f95532519bd # AV1
+      - b6832f586342ef70d9c128d40c07b872 # Bad Dual Groups
+      - cc444569854e9de0b084ab2b8b1532b2 # Black and White Editions
+      - ae9b7c9ebde1f3bd336a8cbd1ec4c5e5 # No-RlsGroup
+      - 7357cf5161efbf8c4d5d0c30b4815ee2 # Obfuscated
+      - 5c44f52a8714fdd79bb4d98e2673be1f # Retags
+      - f537cf427b64c38c8e36298f657e4828 # Scene
+    assign_scores_to:
+      - name: Old

ansible/roles/recyclarr/files/includes/radarr-old-qualities.yml

@@ -0,0 +1,37 @@
+quality_profiles:
+  - name: Old
+    upgrade:
+      allowed: true
+      until_quality: Remux-2160p
+      until_score: 10000
+    min_format_score: 0
+    score_set: default
+    quality_sort: top
+    qualities:
+      - name: Remux-2160p
+      - name: Remux-1080p
+      - name: Bluray-2160p
+      - name: WEB 2160p
+        qualities:
+          - WEBDL-2160p
+          - WEBRip-2160p
+      - name: Bluray-1080p
+      - name: WEB 1080p
+        qualities:
+          - WEBDL-1080p
+          - WEBRip-1080p
+      - name: HDTV-2160p
+      - name: HDTV-1080p
+      - name: Bluray-720p
+      - name: 'WEB 720p'
+        qualities:
+          - WEBDL-720p
+          - WEBRip-720p
+      - name: Bluray-576p
+      - name: Bluray-480p
+      - name: 'WEB 480p'
+        qualities:
+          - WEBDL-480p
+          - WEBRip-480p
+      - name: DVD
+      - name: DVD-R

ansible/roles/recyclarr/files/includes/radarr-remux-custom_formats.yml

@@ -13,8 +13,38 @@ custom_formats:
       - 08d6d8834ad9ec87b1dc7ec8148e7a1f # PQ
       - 9364dd386c9b4a1100dde8264690add7 # HLG
 
+      # HQ Release Groups
+      - 3a3ff47579026e76d6504ebea39390de # Remux Tier 01
+      - 9f98181fe5a3fbeb0cc29340da2a468a # Remux Tier 02
+      - 8baaf0b3142bf4d94c42a724f034e27a # Remux Tier 03
+      - 4d74ac4c4db0b64bff6ce0cffef99bf0 # UHD Bluray Tier 01
+      - a58f517a70193f8e578056642178419d # UHD Bluray Tier 02
+      - e71939fae578037e7aed3ee219bbe7c1 # UHD Bluray Tier 03
+      - ed27ebfef2f323e964fb1f61391bcb35 # HD Bluray Tier 01
+      - c20c8647f2746a1f4c4262b0fbbeeeae # HD Bluray Tier 02
+      - 5608c71bcebba0a5e666223bae8c9227 # HD Bluray Tier 03
+      - c20f169ef63c5f40c2def54abaf4438e # WEB Tier 01
+      - 403816d65392c79236dcb6dd591aeda4 # WEB Tier 02
+      - af94e0fe497124d1f9ce732069ec8c3b # WEB Tier 03
+
+      # General Streaming Services
+      - b3b3a6ac74ecbd56bcdbefa4799fb9df # AMZN
+      - 40e9380490e748672c2522eaaeb692f7 # ATVP
+      - cc5e51a9e85a6296ceefe097a77f12f4 # BCORE
+      - 16622a6911d1ab5d5b8b713d5b0036d4 # CRiT
+      - 84272245b2988854bfb76a16e60baea5 # DSNP
+      - 509e5f41146e278f9eab1ddaceb34515 # HBO
+      - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX
+      - 526d445d4c16214309f0fd2b3be18a89 # Hulu
+      - e0ec9672be6cac914ffad34a6b077209 # iT
+      - 6a061313d22e51e0f25b7cd4dc065233 # MAX
+      - 2a6039655313bf5dab1e43523b62c374 # MA
+      - 170b1d363bd8516fbf3a3eb05d4faff6 # NF
+      - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP
+      - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK
+      - c2863d2a50c9acad1fb50e53ece60817 # STAN
+
       # Movie Versions
-      #- 0f12c086e289cf966fa5948eac571f44 # Hybrid
       - 570bc9ebecd92723d2d21500f4be314c # Remaster
       - eca37840c13c6ef2dd0262b141a5482f # 4K Remaster
       - e0c07d59beb37348e975a930d5e50319 # Criterion Collection
@@ -23,53 +53,31 @@ custom_formats:
       - 957d0f44b592285f26449575e8b1167e # Special Edition
       - eecf3a857724171f968a66cb5719e152 # IMAX
       - 9f6cbff8cfe4ebbc1bde14c7b7bec0de # IMAX Enhanced
+      - 09d9dd29a0fc958f9796e65c2a8864b4 # Open Matte
 
-      # HQ Release Groups
-      - 3a3ff47579026e76d6504ebea39390de # Remux Tier 01
-      - 9f98181fe5a3fbeb0cc29340da2a468a # Remux Tier 02
-      - 8baaf0b3142bf4d94c42a724f034e27a # Remux Tier 03
-      - c20f169ef63c5f40c2def54abaf4438e # WEB Tier 01
-      - 403816d65392c79236dcb6dd591aeda4 # WEB Tier 02
-      - af94e0fe497124d1f9ce732069ec8c3b # WEB Tier 03
-      - 4d74ac4c4db0b64bff6ce0cffef99bf0 # UHD Bluray Tier 01
-      - a58f517a70193f8e578056642178419d # UHD Bluray Tier 02
-      - e71939fae578037e7aed3ee219bbe7c1 # UHD Bluray Tier 03
-      - ed27ebfef2f323e964fb1f61391bcb35 # HD Bluray Tier 01
-      - c20c8647f2746a1f4c4262b0fbbeeeae # HD Bluray Tier 02
-
-      # Misc
+      # Miscellaneous
       - e7718d7a3ce595f289bfee26adc178f5 # Repack/Proper
       - ae43b294509409a6a13919dedd4764c4 # Repack2
-      - f700d29429c023a5734505e77daeaea7 # DV FEL
-
+      - 5caaaa1c08c1742aa4342d8c4cc463f2 # Repack3
+      
       # Unwanted
+      - 923b6abef9b17f937fab56cfcf89e1f1 # DV (WEBDL)
       - ed38b889b31be83fda192888e2286d83 # BR-DISK
+      - e6886871085226c3da1830830146846c # Gererated Dynamic HDR
       - 90a6f9a284dff5103f6346090e6280c8 # LQ
+      - e204b80c87be9497a8a6eaff48f72905 # LQ (Release Title)
+      - 839bea857ed2c0a8e084f3cbdbd65ecb # x265 (no HDR/DV)
+      - 25c12f78430a3a23413652cbd1d48d77 # SDR (no WEBDL)
       - b8cd450cbfa689c0259a01d9e29ba3d6 # 3D
       - bfd8eb01832d646a0a89c4deb46f8564 # Upscaled
       - 0a3f082873eb454bde444150b70253cc # Extras
-      - 839bea857ed2c0a8e084f3cbdbd65ecb # x265 (no HDR/DV)
-      - 25c12f78430a3a23413652cbd1d48d77 # SDR (no WEBDL)
-      - 923b6abef9b17f937fab56cfcf89e1f1 # DV (WEBDL)
-
-      # Streaming Services
-      - cc5e51a9e85a6296ceefe097a77f12f4 # BCORE
-      - 16622a6911d1ab5d5b8b713d5b0036d4 # CRiT
-      - 2a6039655313bf5dab1e43523b62c374 # MA
-      - b3b3a6ac74ecbd56bcdbefa4799fb9df # AMZN
-      - 40e9380490e748672c2522eaaeb692f7 # ATVP
-      - f6ff65b3f4b464a79dcc75950fe20382 # CRAV
-      - 84272245b2988854bfb76a16e60baea5 # DSNP
-      - 509e5f41146e278f9eab1ddaceb34515 # HBO
-      - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX
-      - 526d445d4c16214309f0fd2b3be18a89 # Hulu
-      - 6a061313d22e51e0f25b7cd4dc065233 # MAX
-      - 170b1d363bd8516fbf3a3eb05d4faff6 # NF
-      - fbca986396c5e695ef7b2def3c755d01 # OViD
-      - bf7e73dd1d85b12cc527dc619761c840 # Pathe
-      - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK
-      - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP
-      - c2863d2a50c9acad1fb50e53ece60817 # STAN
-
-    quality_profiles:
+      - 712d74cd88bceb883ee32f773656b1f5 # Sing-Along Versions
+      - cae4ca30163749b891686f95532519bd # AV1
+      - b6832f586342ef70d9c128d40c07b872 # Bad Dual Groups
+      - cc444569854e9de0b084ab2b8b1532b2 # Black and White Editions
+      - ae9b7c9ebde1f3bd336a8cbd1ec4c5e5 # No-RlsGroup
+      - 7357cf5161efbf8c4d5d0c30b4815ee2 # Obfuscated
+      - 5c44f52a8714fdd79bb4d98e2673be1f # Retags
+      - f537cf427b64c38c8e36298f657e4828 # Scene
+    assign_scores_to:
       - name: Remux

ansible/roles/recyclarr/files/includes/radarr-remux-qualities.yml

@@ -1,16 +1,16 @@
 quality_profiles:
   - name: Remux
-    reset_unmatched_scores:
-      enabled: true
     upgrade:
       allowed: true
       until_quality: Remux-2160p
       until_score: 10000
     min_format_score: 0
+    score_set: default
+    quality_sort: top
     qualities:
       - name: Remux-2160p
-      - name: Bluray-2160p
       - name: Remux-1080p
+      - name: Bluray-2160p
       - name: WEB 2160p
         qualities:
           - WEBDL-2160p

ansible/roles/recyclarr/files/includes/radarr-web-custom_formats.yml

@@ -0,0 +1,83 @@
+custom_formats:
+  - trash_ids:
+      # HDR Formats
+      - c53085ddbd027d9624b320627748612f # DV HDR10+
+      - e23edd2482476e595fb990b12e7c609c # DV HDR10
+      - 58d6a88f13e2db7f5059c41047876f00 # DV
+      - 55d53828b9d81cbe20b02efd00aa0efd # DV HLG
+      - a3e19f8f627608af0211acd02bf89735 # DV SDR
+      - b974a6cd08c1066250f1f177d7aa1225 # HDR10+
+      - dfb86d5941bc9075d6af23b09c2aeecd # HDR10
+      - e61e28db95d22bedcadf030b8f156d96 # HDR
+      - 2a4d9069cc1fe3242ff9bdaebed239bb # HDR (undefined)
+      - 08d6d8834ad9ec87b1dc7ec8148e7a1f # PQ
+      - 9364dd386c9b4a1100dde8264690add7 # HLG
+
+      # HQ Release Groups
+      - 3a3ff47579026e76d6504ebea39390de # Remux Tier 01
+      - 9f98181fe5a3fbeb0cc29340da2a468a # Remux Tier 02
+      - 8baaf0b3142bf4d94c42a724f034e27a # Remux Tier 03
+      - 4d74ac4c4db0b64bff6ce0cffef99bf0 # UHD Bluray Tier 01
+      - a58f517a70193f8e578056642178419d # UHD Bluray Tier 02
+      - e71939fae578037e7aed3ee219bbe7c1 # UHD Bluray Tier 03
+      - ed27ebfef2f323e964fb1f61391bcb35 # HD Bluray Tier 01
+      - c20c8647f2746a1f4c4262b0fbbeeeae # HD Bluray Tier 02
+      - 5608c71bcebba0a5e666223bae8c9227 # HD Bluray Tier 03
+      - c20f169ef63c5f40c2def54abaf4438e # WEB Tier 01
+      - 403816d65392c79236dcb6dd591aeda4 # WEB Tier 02
+      - af94e0fe497124d1f9ce732069ec8c3b # WEB Tier 03
+
+      # General Streaming Services
+      - b3b3a6ac74ecbd56bcdbefa4799fb9df # AMZN
+      - 40e9380490e748672c2522eaaeb692f7 # ATVP
+      - cc5e51a9e85a6296ceefe097a77f12f4 # BCORE
+      - 16622a6911d1ab5d5b8b713d5b0036d4 # CRiT
+      - 84272245b2988854bfb76a16e60baea5 # DSNP
+      - 509e5f41146e278f9eab1ddaceb34515 # HBO
+      - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX
+      - 526d445d4c16214309f0fd2b3be18a89 # Hulu
+      - e0ec9672be6cac914ffad34a6b077209 # iT
+      - 6a061313d22e51e0f25b7cd4dc065233 # MAX
+      - 2a6039655313bf5dab1e43523b62c374 # MA
+      - 170b1d363bd8516fbf3a3eb05d4faff6 # NF
+      - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP
+      - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK
+      - c2863d2a50c9acad1fb50e53ece60817 # STAN
+
+      # Movie Versions
+      - 570bc9ebecd92723d2d21500f4be314c # Remaster
+      - eca37840c13c6ef2dd0262b141a5482f # 4K Remaster
+      - e0c07d59beb37348e975a930d5e50319 # Criterion Collection
+      - 9d27d9d2181838f76dee150882bdc58c # Masters of Cinema
+      - db9b4c4b53d312a3ca5f1378f6440fc9 # Vinegar Syndrome
+      - 957d0f44b592285f26449575e8b1167e # Special Edition
+      - eecf3a857724171f968a66cb5719e152 # IMAX
+      - 9f6cbff8cfe4ebbc1bde14c7b7bec0de # IMAX Enhanced
+      - 09d9dd29a0fc958f9796e65c2a8864b4 # Open Matte
+
+      # Miscellaneous
+      - e7718d7a3ce595f289bfee26adc178f5 # Repack/Proper
+      - ae43b294509409a6a13919dedd4764c4 # Repack2
+      - 5caaaa1c08c1742aa4342d8c4cc463f2 # Repack3
+      
+      # Unwanted
+      - 923b6abef9b17f937fab56cfcf89e1f1 # DV (WEBDL)
+      - ed38b889b31be83fda192888e2286d83 # BR-DISK
+      - e6886871085226c3da1830830146846c # Gererated Dynamic HDR
+      - 90a6f9a284dff5103f6346090e6280c8 # LQ
+      - e204b80c87be9497a8a6eaff48f72905 # LQ (Release Title)
+      - 839bea857ed2c0a8e084f3cbdbd65ecb # x265 (no HDR/DV)
+      - 25c12f78430a3a23413652cbd1d48d77 # SDR (no WEBDL)
+      - b8cd450cbfa689c0259a01d9e29ba3d6 # 3D
+      - bfd8eb01832d646a0a89c4deb46f8564 # Upscaled
+      - 0a3f082873eb454bde444150b70253cc # Extras
+      - 712d74cd88bceb883ee32f773656b1f5 # Sing-Along Versions
+      - cae4ca30163749b891686f95532519bd # AV1
+      - b6832f586342ef70d9c128d40c07b872 # Bad Dual Groups
+      - cc444569854e9de0b084ab2b8b1532b2 # Black and White Editions
+      - ae9b7c9ebde1f3bd336a8cbd1ec4c5e5 # No-RlsGroup
+      - 7357cf5161efbf8c4d5d0c30b4815ee2 # Obfuscated
+      - 5c44f52a8714fdd79bb4d98e2673be1f # Retags
+      - f537cf427b64c38c8e36298f657e4828 # Scene
+    assign_scores_to:
+      - name: Web

ansible/roles/recyclarr/files/includes/radarr-web-qualities.yml

@@ -1,17 +1,18 @@
 quality_profiles:
   - name: Web
-    reset_unmatched_scores:
-      enabled: true
     upgrade:
       allowed: true
-      until_quality: WEB 2160p
+      until_quality: 'WEB 2160p'
       until_score: 10000
     min_format_score: 0
+    score_set: default
+    quality_sort: top
     qualities:
       - name: WEB 2160p
         qualities:
           - WEBDL-2160p
           - WEBRip-2160p
+      - name: Bluray-1080p
       - name: WEB 1080p
         qualities:
           - WEBDL-1080p

ansible/roles/recyclarr/files/includes/sonarr-anime-custom_formats.yml

@@ -0,0 +1,85 @@
+custom_formats:
+  - trash_ids:
+      - 2b239ed870daba8126a53bd5dc8dc1c8 # DV HDR10+
+      - 7878c33f1963fefb3d6c8657d46c2f0a # DV HDR10
+      - 6d0d8de7b57e35518ac0308b0ddf404e # DV
+      - 1f733af03141f068a540eec352589a89 # DV HLG
+      - 27954b0a80aab882522a88a4d9eae1cd # DV SDR
+      - a3d82cbef5039f8d295478d28a887159 # HDR10+
+      - 3497799d29a085e2ac2df9d468413c94 # HDR10
+      - 3e2c4e748b64a1a1118e0ea3f4cf6875 # HDR
+      - bb019e1cd00f304f80971c965de064dc # HDR (undefined)
+      - 2a7e3be05d3861d6df7171ec74cad727 # PQ
+      - 17e889ce13117940092308f48b48b45b # HLG
+      - 9b27ab6498ec0f31a3353992e19434ca # DV (WEBDL)
+
+      # Miscellaneous
+      - ec8fa7296b64e8cd390a1600981f3923 # Repack/Proper
+      - eb3d5cc0a2be0db205fb823640db6a3c # Repack v2
+      - 44e7c4de10ae50265753082e5dc76047 # Repack v3
+      - 026d5aadd1a6b4e550b134cb6c72b3ca # Uncensored
+      - 273bd326df95955e1b6c26527d1df89b # v1
+      - 228b8ee9aa0a609463efca874524a6b8 # v2
+      - 0e5833d3af2cc5fa96a0c29cd4477feb # v3
+      - 4fc15eeb8f2f9a749f918217d4234ad8 # v4
+      - b2550eb333d27b75833e25b8c2557b38 # 10bit
+
+      # Streaming Services
+      - d660701077794679fd59e8bdf4ce3a29 # AMZN
+      - f67c9ca88f463a48346062e8ad07713f # ATVP
+      - 77a7b25585c18af08f60b1547bb9b4fb # CC
+      - 36b72f59f4ea20aad9316f475f2d9fbb # DCU
+      - 89358767a60cc28783cdc3d0be9388a4 # DSNP
+      - a880d6abc21e7c16884f3ae393f84179 # HMAX
+      - 7a235133c87f7da4c8cccceca7e3c7a6 # HBO
+      - f6cce30f1733d5c8194222a7507909bb # HULU
+      - 0ac24a2a68a9700bcb7eeca8e5cd644c # iT
+      - 81d1fbf600e2540cee87f3a23f9d3c1c # MAX
+      - d34870697c9db575f17700212167be23 # NF
+      - c67a75ae4a1715f2bb4d492755ba4195 # PMTP
+      - 1656adc6d7bb2c8cca6acfb6592db421 # PCOK
+      - ae58039e1319178e6be73caab5c42166 # SHO
+      - 1efe8da11bfd74fbbcd4d8117ddb9213 # STAN
+      - 9623c5c9cac8e939c1b9aedd32f640bf # SYFY
+      - 9623c5c9cac8e939c1b9aedd32f640bf # UHD Streaming Boost
+      - d2d299244a92b8a52d4921ce3897a256 # UHD Streaming Cut
+
+      # Release Group Tiers
+      - 949c16fe0a8147f50ba82cc2df9411c9 # Anime BD Tier 01 (Top SeaDex Muxers)
+      - ed7f1e315e000aef424a58517fa48727 # Anime BD Tier 02 (SeaDex Muxers)
+      - 096e406c92baa713da4a72d88030b815 # Anime BD Tier 03 (SeaDex Muxers)
+      - 30feba9da3030c5ed1e0f7d610bcadc4 # Anime BD Tier 04 (SeaDex Muxers)
+      - 545a76b14ddc349b8b185a6344e28b04 # Anime BD Tier 05 (Remuxes)
+      - 25d2afecab632b1582eaf03b63055f72 # Anime BD Tier 06 (FanSubs)
+      - 0329044e3d9137b08502a9f84a7e58db # Anime BD Tier 07 (P2P/Scene)
+      - c81bbfb47fed3d5a3ad027d077f889de # Anime BD Tier 08 (Mini Encodes)
+      - e0014372773c8f0e1bef8824f00c7dc4 # Anime Web Tier 01 (Muxers)
+      - 19180499de5ef2b84b6ec59aae444696 # Anime Web Tier 02 (Top FanSubs)
+      - e6258996055b9fbab7e9cb2f75819294 # WEB Tier 01
+      - 58790d4e2fdcd9733aa7ae68ba2bb503 # WEB Tier 02
+      - c27f2ae6a4e82373b0f1da094e2489ad # Anime Web Tier 03 (Official Subs)
+      - d84935abd3f8556dcd51d4f27e22d0a6 # WEB Tier 03
+      - 9965a052eb87b0d10313b1cea89eb451 # Remux Tier 01
+      - 8a1d0c3d7497e741736761a1da866a2e # Remux Tier 02
+      - 4fd5528a3a8024e6b49f9c67053ea5f3 # Anime Web Tier 04 (Official Subs)
+      - 29c2a13d091144f63307e4a8ce963a39 # Anime Web Tier 05 (FanSubs)
+      - dc262f88d74c651b12e9d90b39f6c753 # Anime Web Tier 06 (FanSubs)
+      - d6819cba26b1a6508138d25fb5e32293 # HD Bluray Tier 01
+      - c2216b7b8aa545dc1ce8388c618f8d57 # HD Bluray Tier 02
+      - d0c516558625b04b363fa6c5c2c7cfd4 # WEB Scene
+
+      # Unwanted
+      - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1
+      - b4a1b3d705159cdca36d71e57ca86871 # Anime Raws
+      - e3515e519f3b1360cbfc17651944354c # Anime LQ Groups
+      - d2d7b8a9d39413da5f44054080e028a3 # v0
+      - 9c14d194486c4014d422adc64092d794 # Dubs Only
+      - 07a32f77690263bb9fda1842db7e273f # VOSTFR
+    assign_scores_to:
+      - name: Anime
+
+  - trash_ids:
+      - 418f50b10f1907201b6cfdf881f467b7 # Anime Dual Audio
+    assign_scores_to:
+      - name: Anime
+        score: 10 # Prefer dual audio within the same tier but don't prefer over higher quality releases 

ansible/roles/recyclarr/files/includes/sonarr-anime-qualities.yml

@@ -1,32 +1,32 @@
 quality_profiles:
   - name: Anime
-    reset_unmatched_scores:
-      enabled: true
     upgrade:
       allowed: true
-      until_quality: Bluray 1080p
+      until_quality: Bluray-2160p
       until_score: 10000
     min_format_score: 0
+    score_set: sonarr-anime
+    quality_sort: top
     qualities:
-      - name: Bluray 1080p
+      - name: Bluray-2160p
+        qualities:
+          - Bluray-2160p Remux
+          - Bluray-2160p
+      - name: Bluray-1080p
         qualities:
           - Bluray-1080p Remux
           - Bluray-1080p
+      - name: WEB 2160p
+        qualities:
+          - WEBDL-2160p
+          - WEBRip-2160p
       - name: WEB 1080p
         qualities:
           - WEBDL-1080p
           - WEBRip-1080p
           - HDTV-1080p
-      - name: Bluray-720p
       - name: WEB 720p
         qualities:
           - WEBDL-720p
           - WEBRip-720p
           - HDTV-720p
-      - name: Bluray-480p
-      - name: WEB 480p
-        qualities:
-          - WEBDL-480p
-          - WEBRip-480p
-      - name: DVD
-      - name: SDTV

ansible/roles/recyclarr/files/includes/sonarr-anime.yml

@@ -1,76 +0,0 @@
-custom_formats:
-  - trash_ids:
-      # HQ Release Groups
-      - 949c16fe0a8147f50ba82cc2df9411c9 # Anime BD Tier 01 (Top SeaDex Muxers)
-      - ed7f1e315e000aef424a58517fa48727 # Anime BD Tier 02 (SeaDex Muxers)
-      - 096e406c92baa713da4a72d88030b815 # Anime BD Tier 03 (SeaDex Muxers)
-      - 30feba9da3030c5ed1e0f7d610bcadc4 # Anime BD Tier 04 (SeaDex Muxers)
-      - 545a76b14ddc349b8b185a6344e28b04 # Anime BD Tier 05 (Remuxes)
-      - 25d2afecab632b1582eaf03b63055f72 # Anime BD Tier 06 (FanSubs)
-      - 0329044e3d9137b08502a9f84a7e58db # Anime BD Tier 07 (P2P/Scene)
-      - c81bbfb47fed3d5a3ad027d077f889de # Anime BD Tier 08 (Mini Encodes)
-      - e0014372773c8f0e1bef8824f00c7dc4 # Anime Web Tier 01 (Muxers)
-      - 19180499de5ef2b84b6ec59aae444696 # Anime Web Tier 02 (Top FanSubs)
-      - c27f2ae6a4e82373b0f1da094e2489ad # Anime Web Tier 03 (Official Subs)
-      - 4fd5528a3a8024e6b49f9c67053ea5f3 # Anime Web Tier 04 (Official Subs)
-      - 29c2a13d091144f63307e4a8ce963a39 # Anime Web Tier 05 (FanSubs)
-      - dc262f88d74c651b12e9d90b39f6c753 # Anime Web Tier 06 (FanSubs)
-
-      # Misc
-      - 273bd326df95955e1b6c26527d1df89b # v1
-      - 228b8ee9aa0a609463efca874524a6b8 # v2
-      - 0e5833d3af2cc5fa96a0c29cd4477feb # v3
-      - 4fc15eeb8f2f9a749f918217d4234ad8 # v4
-
-      # Unwanted
-      - d2d7b8a9d39413da5f44054080e028a3 # v0
-      - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1
-      - 07a32f77690263bb9fda1842db7e273f # VOSTFR
-      - e3515e519f3b1360cbfc17651944354c # Anime LQ Groups
-      - b4a1b3d705159cdca36d71e57ca86871 # Anime Raws
-      - 9c14d194486c4014d422adc64092d794 # Dubs Only
-
-      # Anime Streaming Services
-      - 3e0b26604165f463f3e8e192261e7284 # CR
-      - 1284d18e693de8efe0fe7d6b3e0b9170 # FUNi
-      - 44a8ee6403071dd7b8a3a8dd3fe8cb20 # VRV
-      - 89358767a60cc28783cdc3d0be9388a4 # DSNP
-      - d34870697c9db575f17700212167be23 # NF
-      - d660701077794679fd59e8bdf4ce3a29 # AMZN
-      - d54cd2bf1326287275b56bccedb72ee2 # ADN
-      - 7dd31f3dee6d2ef8eeaa156e23c3857e # B-Global
-      - 4c67ff059210182b59cdd41697b8cb08 # Bilibili
-      - 570b03b3145a25011bf073274a407259 # HIDIVE
-    quality_profiles:
-      - name: Anime
-
-  - trash_ids: [9965a052eb87b0d10313b1cea89eb451] # Remux Tier 01
-    quality_profiles:
-      - name: Anime
-        score: 1050
-  - trash_ids: [8a1d0c3d7497e741736761a1da866a2e] # Remux Tier 02
-    quality_profiles:
-      - name: Anime
-        score: 1000
-  - trash_ids: [e6258996055b9fbab7e9cb2f75819294] # WEB Tier 01
-    quality_profiles:
-      - name: Anime
-        score: 350
-  - trash_ids: [58790d4e2fdcd9733aa7ae68ba2bb503] # WEB Tier 02
-    quality_profiles:
-      - name: Anime
-        score: 150
-  - trash_ids: [d84935abd3f8556dcd51d4f27e22d0a6] # WEB Tier 03
-    quality_profiles:
-      - name: Anime
-        score: 150
-
-  - trash_ids: [418f50b10f1907201b6cfdf881f467b7] # Anime Dual Audio
-    quality_profiles:
-      - name: Anime
-        score: 10
-
-  - trash_ids: [026d5aadd1a6b4e550b134cb6c72b3ca] # Uncensored
-    quality_profiles:
-      - name: Anime
-        score: 10

ansible/roles/recyclarr/files/includes/sonarr-encode-custom_formats.yml

@@ -3,60 +3,45 @@ custom_formats:
       # HDR Formats
       - 2b239ed870daba8126a53bd5dc8dc1c8 # DV HDR10+
       - 7878c33f1963fefb3d6c8657d46c2f0a # DV HDR10
+      - 6d0d8de7b57e35518ac0308b0ddf404e # DV
       - 1f733af03141f068a540eec352589a89 # DV HLG
       - 27954b0a80aab882522a88a4d9eae1cd # DV SDR
-      - ef4963043b0987f8485bc9106f16db38 # DV FEL
-      - 6d0d8de7b57e35518ac0308b0ddf404e # DV
-      - bb019e1cd00f304f80971c965de064dc # HDR (undefined)
-      - 3e2c4e748b64a1a1118e0ea3f4cf6875 # HDR
-      - 3497799d29a085e2ac2df9d468413c94 # HDR10
       - a3d82cbef5039f8d295478d28a887159 # HDR10+
-      - 17e889ce13117940092308f48b48b45b # HLG
+      - 3497799d29a085e2ac2df9d468413c94 # HDR10
+      - 3e2c4e748b64a1a1118e0ea3f4cf6875 # HDR
+      - bb019e1cd00f304f80971c965de064dc # HDR (undefined)
       - 2a7e3be05d3861d6df7171ec74cad727 # PQ
-
-      # Unwanted
-      - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK
-      - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ
-      - 9b64dff695c2115facf1b6ea59c9bd07 # x265 (no HDR)
-      - fbcb31d8dabd2a319072b84fc0b7249c # Extras
-      - 83304f261cf516bb208c18c54c0adf97 # SDR (no WEBDL)
-      - 82d40da2bc6923f41e14394075dd4b03 # No-RlsGroup
-      - e1a997ddb54e3ecbfe06341ad323c458 # Obfuscated
-      - 06d66ab109d4d2eddb2794d21526d140 # Retag
-      - 32b367365729d530ca1c124a0b180c64 # Bad Dual Groups
+      - 17e889ce13117940092308f48b48b45b # HLG
       - 9b27ab6498ec0f31a3353992e19434ca # DV (WEBDL)
 
-      # Misc
+      # Miscellaneous
       - ec8fa7296b64e8cd390a1600981f3923 # Repack/Proper
       - eb3d5cc0a2be0db205fb823640db6a3c # Repack v2
       - 44e7c4de10ae50265753082e5dc76047 # Repack v3
+      - b735f09d3c025cbb7d75a5d38325b73b # Remaster
+      - 3bc5f395426614e155e585a2f056cdf1 # Season Pack
 
       # Streaming Services
       - d660701077794679fd59e8bdf4ce3a29 # AMZN
       - f67c9ca88f463a48346062e8ad07713f # ATVP
-      - 4e9a630db98d5391aec1368a0256e2fe # CRAV
+      - 77a7b25585c18af08f60b1547bb9b4fb # CC
       - 36b72f59f4ea20aad9316f475f2d9fbb # DCU
       - 89358767a60cc28783cdc3d0be9388a4 # DSNP
-      - 7a235133c87f7da4c8cccceca7e3c7a6 # HBO
       - a880d6abc21e7c16884f3ae393f84179 # HMAX
+      - 7a235133c87f7da4c8cccceca7e3c7a6 # HBO
       - f6cce30f1733d5c8194222a7507909bb # HULU
       - 0ac24a2a68a9700bcb7eeca8e5cd644c # iT
       - 81d1fbf600e2540cee87f3a23f9d3c1c # MAX
       - d34870697c9db575f17700212167be23 # NF
-      - b2b980877494b560443631eb1f473867 # NLZ
-      - fb1a91cdc0f26f7ca0696e0e95274645 # OViD
-      - 1656adc6d7bb2c8cca6acfb6592db421 # PCOK
       - c67a75ae4a1715f2bb4d492755ba4195 # PMTP
-      - 3ac5d84fce98bab1b531393e9c82f467 # QIBI
-      - c30d2958827d1867c73318a5a2957eb1 # RED
+      - 1656adc6d7bb2c8cca6acfb6592db421 # PCOK
       - ae58039e1319178e6be73caab5c42166 # SHO
       - 1efe8da11bfd74fbbcd4d8117ddb9213 # STAN
-      - 5d2317d99af813b6529c7ebf01c83533 # VDL
-      - 77a7b25585c18af08f60b1547bb9b4fb # CC
-      - 43b3cf48cb385cd3eac608ee6bca7f09 # UHD Streaming Boost
+      - 9623c5c9cac8e939c1b9aedd32f640bf # SYFY
+      - 9623c5c9cac8e939c1b9aedd32f640bf # UHD Streaming Boost
       - d2d299244a92b8a52d4921ce3897a256 # UHD Streaming Cut
 
-      # HQ Source Groups
+      # Release Group Tiers
       - 9965a052eb87b0d10313b1cea89eb451 # Remux Tier 01
       - 8a1d0c3d7497e741736761a1da866a2e # Remux Tier 02
       - d6819cba26b1a6508138d25fb5e32293 # HD Bluray Tier 01
@@ -65,10 +50,19 @@ custom_formats:
       - 58790d4e2fdcd9733aa7ae68ba2bb503 # WEB Tier 02
       - d84935abd3f8556dcd51d4f27e22d0a6 # WEB Tier 03
       - d0c516558625b04b363fa6c5c2c7cfd4 # WEB Scene
-    quality_profiles:
-      - name: Remux
 
-  - trash_ids: [3bc5f395426614e155e585a2f056cdf1] # Season Pack
-    quality_profiles:
+      # Unwanted
+      - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK
+      - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ
+      - e2315f990da2e2cbfc9fa5b7a6fcfe48 # LQ (Release Title)
+      - 9b64dff695c2115facf1b6ea59c9bd07 # x265 (no HDR/DV)
+      - 83304f261cf516bb208c18c54c0adf97 # SDR (no WEBDL)
+      - fbcb31d8dabd2a319072b84fc0b7249c # Extras
+      - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1
+      - 32b367365729d530ca1c124a0b180c64 # Bad Dual Groups
+      - 82d40da2bc6923f41e14394075dd4b03 # No-RlsGroup
+      - e1a997ddb54e3ecbfe06341ad323c458 # Obfuscated
+      - 06d66ab109d4d2eddb2794d21526d140 # Retags
+      - b735f09d3c025cbb7d75a5d38325b73b # Upscaled
+    assign_scores_to:
       - name: Remux
-        score: 10

ansible/roles/recyclarr/files/includes/sonarr-encode-qualities.yml

@@ -1,17 +1,21 @@
 quality_profiles:
-  - name: Season Pack
-    reset_unmatched_scores:
-      enabled: true
+  - name: Remux
     upgrade:
       allowed: true
-      until_quality: WEB 2160p
+      until_quality: 'Bluray-2160p Remux'
       until_score: 10000
     min_format_score: 0
+    score_set: default
+    quality_sort: top
     qualities:
+      - name: 'Bluray-2160p Remux'
+      - name: 'Bluray-1080p Remux'
+      - name: Bluray-2160p
       - name: WEB 2160p
         qualities:
           - WEBDL-2160p
           - WEBRip-2160p
+      - name: Bluray-1080p
       - name: WEB 1080p
         qualities:
           - WEBDL-1080p

ansible/roles/recyclarr/files/includes/sonarr-old-custom_formats.yml

@@ -0,0 +1,67 @@
+custom_formats:
+  - trash_ids:
+      # HDR Formats
+      - 2b239ed870daba8126a53bd5dc8dc1c8 # DV HDR10+
+      - 7878c33f1963fefb3d6c8657d46c2f0a # DV HDR10
+      - 6d0d8de7b57e35518ac0308b0ddf404e # DV
+      - 1f733af03141f068a540eec352589a89 # DV HLG
+      - 27954b0a80aab882522a88a4d9eae1cd # DV SDR
+      - a3d82cbef5039f8d295478d28a887159 # HDR10+
+      - 3497799d29a085e2ac2df9d468413c94 # HDR10
+      - 3e2c4e748b64a1a1118e0ea3f4cf6875 # HDR
+      - bb019e1cd00f304f80971c965de064dc # HDR (undefined)
+      - 2a7e3be05d3861d6df7171ec74cad727 # PQ
+      - 17e889ce13117940092308f48b48b45b # HLG
+      - 9b27ab6498ec0f31a3353992e19434ca # DV (WEBDL)
+
+      # Miscellaneous
+      - ec8fa7296b64e8cd390a1600981f3923 # Repack/Proper
+      - eb3d5cc0a2be0db205fb823640db6a3c # Repack v2
+      - 44e7c4de10ae50265753082e5dc76047 # Repack v3
+      - b735f09d3c025cbb7d75a5d38325b73b # Remaster
+      - 3bc5f395426614e155e585a2f056cdf1 # Season Pack
+
+      # Streaming Services
+      - d660701077794679fd59e8bdf4ce3a29 # AMZN
+      - f67c9ca88f463a48346062e8ad07713f # ATVP
+      - 77a7b25585c18af08f60b1547bb9b4fb # CC
+      - 36b72f59f4ea20aad9316f475f2d9fbb # DCU
+      - 89358767a60cc28783cdc3d0be9388a4 # DSNP
+      - a880d6abc21e7c16884f3ae393f84179 # HMAX
+      - 7a235133c87f7da4c8cccceca7e3c7a6 # HBO
+      - f6cce30f1733d5c8194222a7507909bb # HULU
+      - 0ac24a2a68a9700bcb7eeca8e5cd644c # iT
+      - 81d1fbf600e2540cee87f3a23f9d3c1c # MAX
+      - d34870697c9db575f17700212167be23 # NF
+      - c67a75ae4a1715f2bb4d492755ba4195 # PMTP
+      - 1656adc6d7bb2c8cca6acfb6592db421 # PCOK
+      - ae58039e1319178e6be73caab5c42166 # SHO
+      - 1efe8da11bfd74fbbcd4d8117ddb9213 # STAN
+      - 9623c5c9cac8e939c1b9aedd32f640bf # SYFY
+      - 9623c5c9cac8e939c1b9aedd32f640bf # UHD Streaming Boost
+      - d2d299244a92b8a52d4921ce3897a256 # UHD Streaming Cut
+
+      # Release Group Tiers
+      - 9965a052eb87b0d10313b1cea89eb451 # Remux Tier 01
+      - 8a1d0c3d7497e741736761a1da866a2e # Remux Tier 02
+      - d6819cba26b1a6508138d25fb5e32293 # HD Bluray Tier 01
+      - c2216b7b8aa545dc1ce8388c618f8d57 # HD Bluray Tier 02
+      - e6258996055b9fbab7e9cb2f75819294 # WEB Tier 01
+      - 58790d4e2fdcd9733aa7ae68ba2bb503 # WEB Tier 02
+      - d84935abd3f8556dcd51d4f27e22d0a6 # WEB Tier 03
+      - d0c516558625b04b363fa6c5c2c7cfd4 # WEB Scene
+
+      # Unwanted
+      - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK
+      - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ
+      - e2315f990da2e2cbfc9fa5b7a6fcfe48 # LQ (Release Title)
+      - 9b64dff695c2115facf1b6ea59c9bd07 # x265 (no HDR/DV)
+      - 83304f261cf516bb208c18c54c0adf97 # SDR (no WEBDL)
+      - fbcb31d8dabd2a319072b84fc0b7249c # Extras
+      - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1
+      - 32b367365729d530ca1c124a0b180c64 # Bad Dual Groups
+      - e1a997ddb54e3ecbfe06341ad323c458 # Obfuscated
+      - 06d66ab109d4d2eddb2794d21526d140 # Retags
+      - b735f09d3c025cbb7d75a5d38325b73b # Upscaled
+    assign_scores_to:
+      - name: Old

ansible/roles/recyclarr/files/includes/sonarr-old-qualities.yml

@@ -0,0 +1,38 @@
+quality_profiles:
+  - name: Old
+    upgrade:
+      allowed: true
+      until_quality: 'Bluray-2160p Remux'
+      until_score: 10000
+    min_format_score: 0
+    score_set: default
+    quality_sort: top
+    qualities:
+      - name: 'Bluray-2160p Remux'
+      - name: 'Bluray-1080p Remux'
+      - name: Bluray-2160p
+      - name: 'WEB 2160p'
+        qualities:
+          - WEBDL-2160p
+          - WEBRip-2160p
+      - name: Bluray-1080p
+      - name: 'WEB 1080p'
+        qualities:
+          - WEBDL-1080p
+          - WEBRip-1080p
+      - name: HDTV-2160p
+      - name: Bluray-720p
+      - name: 'WEB 720p' 
+        qualities:
+          - WEBDL-720p
+          - WEBRip-720p
+      - name: HDTV-1080p
+      - name: HDTV-720p
+      - name: Bluray-576p
+      - name: Bluray-480p
+      - name: DVD
+      - name: 'WEB 480p'
+        qualities:
+          - WEBDL-480p
+          - WEBRip-480p
+      - name: SDTV

ansible/roles/recyclarr/files/includes/sonarr-old_season_pack-custom_formats.yml

@@ -0,0 +1,73 @@
+custom_formats:
+  - trash_ids:
+      # HDR Formats
+      - 2b239ed870daba8126a53bd5dc8dc1c8 # DV HDR10+
+      - 7878c33f1963fefb3d6c8657d46c2f0a # DV HDR10
+      - 6d0d8de7b57e35518ac0308b0ddf404e # DV
+      - 1f733af03141f068a540eec352589a89 # DV HLG
+      - 27954b0a80aab882522a88a4d9eae1cd # DV SDR
+      - a3d82cbef5039f8d295478d28a887159 # HDR10+
+      - 3497799d29a085e2ac2df9d468413c94 # HDR10
+      - 3e2c4e748b64a1a1118e0ea3f4cf6875 # HDR
+      - bb019e1cd00f304f80971c965de064dc # HDR (undefined)
+      - 2a7e3be05d3861d6df7171ec74cad727 # PQ
+      - 17e889ce13117940092308f48b48b45b # HLG
+      - 9b27ab6498ec0f31a3353992e19434ca # DV (WEBDL)
+
+      # Miscellaneous
+      - ec8fa7296b64e8cd390a1600981f3923 # Repack/Proper
+      - eb3d5cc0a2be0db205fb823640db6a3c # Repack v2
+      - 44e7c4de10ae50265753082e5dc76047 # Repack v3
+      - b735f09d3c025cbb7d75a5d38325b73b # Remaster
+      - 3bc5f395426614e155e585a2f056cdf1 # Season Pack
+
+      # Streaming Services
+      - d660701077794679fd59e8bdf4ce3a29 # AMZN
+      - f67c9ca88f463a48346062e8ad07713f # ATVP
+      - 77a7b25585c18af08f60b1547bb9b4fb # CC
+      - 36b72f59f4ea20aad9316f475f2d9fbb # DCU
+      - 89358767a60cc28783cdc3d0be9388a4 # DSNP
+      - a880d6abc21e7c16884f3ae393f84179 # HMAX
+      - 7a235133c87f7da4c8cccceca7e3c7a6 # HBO
+      - f6cce30f1733d5c8194222a7507909bb # HULU
+      - 0ac24a2a68a9700bcb7eeca8e5cd644c # iT
+      - 81d1fbf600e2540cee87f3a23f9d3c1c # MAX
+      - d34870697c9db575f17700212167be23 # NF
+      - c67a75ae4a1715f2bb4d492755ba4195 # PMTP
+      - 1656adc6d7bb2c8cca6acfb6592db421 # PCOK
+      - ae58039e1319178e6be73caab5c42166 # SHO
+      - 1efe8da11bfd74fbbcd4d8117ddb9213 # STAN
+      - 9623c5c9cac8e939c1b9aedd32f640bf # SYFY
+      - 9623c5c9cac8e939c1b9aedd32f640bf # UHD Streaming Boost
+      - d2d299244a92b8a52d4921ce3897a256 # UHD Streaming Cut
+
+      # Release Group Tiers
+      - 9965a052eb87b0d10313b1cea89eb451 # Remux Tier 01
+      - 8a1d0c3d7497e741736761a1da866a2e # Remux Tier 02
+      - d6819cba26b1a6508138d25fb5e32293 # HD Bluray Tier 01
+      - c2216b7b8aa545dc1ce8388c618f8d57 # HD Bluray Tier 02
+      - e6258996055b9fbab7e9cb2f75819294 # WEB Tier 01
+      - 58790d4e2fdcd9733aa7ae68ba2bb503 # WEB Tier 02
+      - d84935abd3f8556dcd51d4f27e22d0a6 # WEB Tier 03
+      - d0c516558625b04b363fa6c5c2c7cfd4 # WEB Scene
+
+      # Unwanted
+      - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK
+      - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ
+      - e2315f990da2e2cbfc9fa5b7a6fcfe48 # LQ (Release Title)
+      - 9b64dff695c2115facf1b6ea59c9bd07 # x265 (no HDR/DV)
+      - 83304f261cf516bb208c18c54c0adf97 # SDR (no WEBDL)
+      - fbcb31d8dabd2a319072b84fc0b7249c # Extras
+      - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1
+      - 32b367365729d530ca1c124a0b180c64 # Bad Dual Groups
+      - e1a997ddb54e3ecbfe06341ad323c458 # Obfuscated
+      - 06d66ab109d4d2eddb2794d21526d140 # Retags
+      - b735f09d3c025cbb7d75a5d38325b73b # Upscaled
+    assign_scores_to:
+      - name: 'Old - Season Pack'
+
+  - trash_ids:
+      - e0c1a67f23908a55b6ae9834e8ed6727 # Single Episode
+    assign_scores_to:
+      - name: 'Old - Season Pack'
+        score: -10000

ansible/roles/recyclarr/files/includes/sonarr-old_season_pack-qualities.yml

@@ -0,0 +1,38 @@
+quality_profiles:
+  - name: 'Old - Season Pack'
+    upgrade:
+      allowed: true
+      until_quality: 'Bluray-2160p Remux'
+      until_score: 10000
+    min_format_score: 0
+    score_set: default
+    quality_sort: top
+    qualities:
+      - name: 'Bluray-2160p Remux'
+      - name: 'Bluray-1080p Remux'
+      - name: Bluray-2160p
+      - name: 'WEB 2160p'
+        qualities:
+          - WEBDL-2160p
+          - WEBRip-2160p
+      - name: Bluray-1080p
+      - name: 'WEB 1080p'
+        qualities:
+          - WEBDL-1080p
+          - WEBRip-1080p
+      - name: HDTV-2160p
+      - name: Bluray-720p
+      - name: 'WEB 720p' 
+        qualities:
+          - WEBDL-720p
+          - WEBRip-720p
+      - name: HDTV-1080p
+      - name: HDTV-720p
+      - name: Bluray-576p
+      - name: Bluray-480p
+      - name: DVD
+      - name: 'WEB 480p'
+        qualities:
+          - WEBDL-480p
+          - WEBRip-480p
+      - name: SDTV

ansible/roles/recyclarr/files/includes/sonarr-remux-custom_formats.yml

@@ -3,67 +3,66 @@ custom_formats:
       # HDR Formats
       - 2b239ed870daba8126a53bd5dc8dc1c8 # DV HDR10+
       - 7878c33f1963fefb3d6c8657d46c2f0a # DV HDR10
+      - 6d0d8de7b57e35518ac0308b0ddf404e # DV
       - 1f733af03141f068a540eec352589a89 # DV HLG
       - 27954b0a80aab882522a88a4d9eae1cd # DV SDR
-      - 6d0d8de7b57e35518ac0308b0ddf404e # DV
-      - bb019e1cd00f304f80971c965de064dc # HDR (undefined)
-      - 3e2c4e748b64a1a1118e0ea3f4cf6875 # HDR
-      - 3497799d29a085e2ac2df9d468413c94 # HDR10
       - a3d82cbef5039f8d295478d28a887159 # HDR10+
-      - 17e889ce13117940092308f48b48b45b # HLG
+      - 3497799d29a085e2ac2df9d468413c94 # HDR10
+      - 3e2c4e748b64a1a1118e0ea3f4cf6875 # HDR
+      - bb019e1cd00f304f80971c965de064dc # HDR (undefined)
       - 2a7e3be05d3861d6df7171ec74cad727 # PQ
-
-      # Unwanted
-      - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK
-      - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ
-      - 9b64dff695c2115facf1b6ea59c9bd07 # x265 (no HDR)
-      - fbcb31d8dabd2a319072b84fc0b7249c # Extras
-      - 83304f261cf516bb208c18c54c0adf97 # SDR (no WEBDL)
-      - 06d66ab109d4d2eddb2794d21526d140 # Retags
-      - e1a997ddb54e3ecbfe06341ad323c458 # Obfuscated
-      - 32b367365729d530ca1c124a0b180c64 # Bad Dual Groups
-      - 82d40da2bc6923f41e14394075dd4b03 # No-RlsGroup
+      - 17e889ce13117940092308f48b48b45b # HLG
       - 9b27ab6498ec0f31a3353992e19434ca # DV (WEBDL)
 
-      # Misc
+      # Miscellaneous
       - ec8fa7296b64e8cd390a1600981f3923 # Repack/Proper
       - eb3d5cc0a2be0db205fb823640db6a3c # Repack v2
       - 44e7c4de10ae50265753082e5dc76047 # Repack v3
+      - b735f09d3c025cbb7d75a5d38325b73b # Remaster
+      - 3bc5f395426614e155e585a2f056cdf1 # Season Pack
 
       # Streaming Services
       - d660701077794679fd59e8bdf4ce3a29 # AMZN
       - f67c9ca88f463a48346062e8ad07713f # ATVP
-      - 4e9a630db98d5391aec1368a0256e2fe # CRAV
+      - 77a7b25585c18af08f60b1547bb9b4fb # CC
       - 36b72f59f4ea20aad9316f475f2d9fbb # DCU
       - 89358767a60cc28783cdc3d0be9388a4 # DSNP
-      - 7a235133c87f7da4c8cccceca7e3c7a6 # HBO
       - a880d6abc21e7c16884f3ae393f84179 # HMAX
+      - 7a235133c87f7da4c8cccceca7e3c7a6 # HBO
       - f6cce30f1733d5c8194222a7507909bb # HULU
       - 0ac24a2a68a9700bcb7eeca8e5cd644c # iT
       - 81d1fbf600e2540cee87f3a23f9d3c1c # MAX
       - d34870697c9db575f17700212167be23 # NF
-      - b2b980877494b560443631eb1f473867 # NLZ
-      - fb1a91cdc0f26f7ca0696e0e95274645 # OViD
-      - 1656adc6d7bb2c8cca6acfb6592db421 # PCOK
       - c67a75ae4a1715f2bb4d492755ba4195 # PMTP
-      - 3ac5d84fce98bab1b531393e9c82f467 # QIBI
-      - c30d2958827d1867c73318a5a2957eb1 # RED
+      - 1656adc6d7bb2c8cca6acfb6592db421 # PCOK
       - ae58039e1319178e6be73caab5c42166 # SHO
       - 1efe8da11bfd74fbbcd4d8117ddb9213 # STAN
-      - 5d2317d99af813b6529c7ebf01c83533 # VDL
-      - 77a7b25585c18af08f60b1547bb9b4fb # CC
-      - 43b3cf48cb385cd3eac608ee6bca7f09 # UHD Streaming Boost
+      - 9623c5c9cac8e939c1b9aedd32f640bf # SYFY
+      - 9623c5c9cac8e939c1b9aedd32f640bf # UHD Streaming Boost
       - d2d299244a92b8a52d4921ce3897a256 # UHD Streaming Cut
 
-      # HQ Source Groups
+      # Release Group Tiers
+      - 9965a052eb87b0d10313b1cea89eb451 # Remux Tier 01
+      - 8a1d0c3d7497e741736761a1da866a2e # Remux Tier 02
+      - d6819cba26b1a6508138d25fb5e32293 # HD Bluray Tier 01
+      - c2216b7b8aa545dc1ce8388c618f8d57 # HD Bluray Tier 02
       - e6258996055b9fbab7e9cb2f75819294 # WEB Tier 01
       - 58790d4e2fdcd9733aa7ae68ba2bb503 # WEB Tier 02
       - d84935abd3f8556dcd51d4f27e22d0a6 # WEB Tier 03
       - d0c516558625b04b363fa6c5c2c7cfd4 # WEB Scene
-    quality_profiles:
-      - name: Web
 
-  - trash_ids: [3bc5f395426614e155e585a2f056cdf1] # Season Pack
-    quality_profiles:
-      - name: Web
-        score: 10
+      # Unwanted
+      - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK
+      - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ
+      - e2315f990da2e2cbfc9fa5b7a6fcfe48 # LQ (Release Title)
+      - 9b64dff695c2115facf1b6ea59c9bd07 # x265 (no HDR/DV)
+      - 83304f261cf516bb208c18c54c0adf97 # SDR (no WEBDL)
+      - fbcb31d8dabd2a319072b84fc0b7249c # Extras
+      - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1
+      - 32b367365729d530ca1c124a0b180c64 # Bad Dual Groups
+      - 82d40da2bc6923f41e14394075dd4b03 # No-RlsGroup
+      - e1a997ddb54e3ecbfe06341ad323c458 # Obfuscated
+      - 06d66ab109d4d2eddb2794d21526d140 # Retags
+      - b735f09d3c025cbb7d75a5d38325b73b # Upscaled
+    assign_scores_to:
+      - name: Remux

ansible/roles/recyclarr/files/includes/sonarr-remux-qualities.yml

@@ -1,16 +1,16 @@
 quality_profiles:
   - name: Remux
-    reset_unmatched_scores:
-      enabled: true
     upgrade:
       allowed: true
-      until_quality: Bluray-2160p Remux
+      until_quality: 'Bluray-2160p Remux'
       until_score: 10000
     min_format_score: 0
+    score_set: default
+    quality_sort: top
     qualities:
-      - name: Bluray-2160p Remux
+      - name: 'Bluray-2160p Remux'
+      - name: 'Bluray-1080p Remux'
       - name: Bluray-2160p
-      - name: Bluray-1080p Remux
       - name: WEB 2160p
         qualities:
           - WEBDL-2160p

ansible/roles/recyclarr/files/includes/sonarr-remux_season_pack-custom_formats.yml

@@ -0,0 +1,74 @@
+custom_formats:
+  - trash_ids:
+      # HDR Formats
+      - 2b239ed870daba8126a53bd5dc8dc1c8 # DV HDR10+
+      - 7878c33f1963fefb3d6c8657d46c2f0a # DV HDR10
+      - 6d0d8de7b57e35518ac0308b0ddf404e # DV
+      - 1f733af03141f068a540eec352589a89 # DV HLG
+      - 27954b0a80aab882522a88a4d9eae1cd # DV SDR
+      - a3d82cbef5039f8d295478d28a887159 # HDR10+
+      - 3497799d29a085e2ac2df9d468413c94 # HDR10
+      - 3e2c4e748b64a1a1118e0ea3f4cf6875 # HDR
+      - bb019e1cd00f304f80971c965de064dc # HDR (undefined)
+      - 2a7e3be05d3861d6df7171ec74cad727 # PQ
+      - 17e889ce13117940092308f48b48b45b # HLG
+      - 9b27ab6498ec0f31a3353992e19434ca # DV (WEBDL)
+
+      # Miscellaneous
+      - ec8fa7296b64e8cd390a1600981f3923 # Repack/Proper
+      - eb3d5cc0a2be0db205fb823640db6a3c # Repack v2
+      - 44e7c4de10ae50265753082e5dc76047 # Repack v3
+      - b735f09d3c025cbb7d75a5d38325b73b # Remaster
+      - 3bc5f395426614e155e585a2f056cdf1 # Season Pack
+
+      # Streaming Services
+      - d660701077794679fd59e8bdf4ce3a29 # AMZN
+      - f67c9ca88f463a48346062e8ad07713f # ATVP
+      - 77a7b25585c18af08f60b1547bb9b4fb # CC
+      - 36b72f59f4ea20aad9316f475f2d9fbb # DCU
+      - 89358767a60cc28783cdc3d0be9388a4 # DSNP
+      - a880d6abc21e7c16884f3ae393f84179 # HMAX
+      - 7a235133c87f7da4c8cccceca7e3c7a6 # HBO
+      - f6cce30f1733d5c8194222a7507909bb # HULU
+      - 0ac24a2a68a9700bcb7eeca8e5cd644c # iT
+      - 81d1fbf600e2540cee87f3a23f9d3c1c # MAX
+      - d34870697c9db575f17700212167be23 # NF
+      - c67a75ae4a1715f2bb4d492755ba4195 # PMTP
+      - 1656adc6d7bb2c8cca6acfb6592db421 # PCOK
+      - ae58039e1319178e6be73caab5c42166 # SHO
+      - 1efe8da11bfd74fbbcd4d8117ddb9213 # STAN
+      - 9623c5c9cac8e939c1b9aedd32f640bf # SYFY
+      - 9623c5c9cac8e939c1b9aedd32f640bf # UHD Streaming Boost
+      - d2d299244a92b8a52d4921ce3897a256 # UHD Streaming Cut
+
+      # Release Group Tiers
+      - 9965a052eb87b0d10313b1cea89eb451 # Remux Tier 01
+      - 8a1d0c3d7497e741736761a1da866a2e # Remux Tier 02
+      - d6819cba26b1a6508138d25fb5e32293 # HD Bluray Tier 01
+      - c2216b7b8aa545dc1ce8388c618f8d57 # HD Bluray Tier 02
+      - e6258996055b9fbab7e9cb2f75819294 # WEB Tier 01
+      - 58790d4e2fdcd9733aa7ae68ba2bb503 # WEB Tier 02
+      - d84935abd3f8556dcd51d4f27e22d0a6 # WEB Tier 03
+      - d0c516558625b04b363fa6c5c2c7cfd4 # WEB Scene
+
+      # Unwanted
+      - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK
+      - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ
+      - e2315f990da2e2cbfc9fa5b7a6fcfe48 # LQ (Release Title)
+      - 9b64dff695c2115facf1b6ea59c9bd07 # x265 (no HDR/DV)
+      - 83304f261cf516bb208c18c54c0adf97 # SDR (no WEBDL)
+      - fbcb31d8dabd2a319072b84fc0b7249c # Extras
+      - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1
+      - 32b367365729d530ca1c124a0b180c64 # Bad Dual Groups
+      - 82d40da2bc6923f41e14394075dd4b03 # No-RlsGroup
+      - e1a997ddb54e3ecbfe06341ad323c458 # Obfuscated
+      - 06d66ab109d4d2eddb2794d21526d140 # Retags
+      - b735f09d3c025cbb7d75a5d38325b73b # Upscaled
+    assign_scores_to:
+      - name: 'Remux - Season Pack'
+
+  - trash_ids:
+      - e0c1a67f23908a55b6ae9834e8ed6727 # Single Episode
+    assign_scores_to:
+      - name: 'Remux - Season Pack'
+        score: -10000

ansible/roles/recyclarr/files/includes/sonarr-remux_season_pack-qualities.yml

@@ -0,0 +1,23 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/recyclarr/recyclarr/master/schemas/config-schema.json
+quality_profiles:
+  - name: "Remux - Season Pack"
+    upgrade:
+      allowed: true
+      until_quality: 'Bluray-2160p Remux'
+      until_score: 10000
+    min_format_score: 0
+    score_set: default
+    quality_sort: top
+    qualities:
+      - name: 'Bluray-2160p Remux'
+      - name: 'Bluray-1080p Remux'
+      - name: Bluray-2160p
+      - name: WEB 2160p
+        qualities:
+          - WEBDL-2160p
+          - WEBRip-2160p
+      - name: Bluray-1080p
+      - name: WEB 1080p
+        qualities:
+          - WEBDL-1080p
+          - WEBRip-1080p

ansible/roles/recyclarr/files/includes/sonarr-web-custom_formats.yml

@@ -3,69 +3,66 @@ custom_formats:
       # HDR Formats
       - 2b239ed870daba8126a53bd5dc8dc1c8 # DV HDR10+
       - 7878c33f1963fefb3d6c8657d46c2f0a # DV HDR10
+      - 6d0d8de7b57e35518ac0308b0ddf404e # DV
       - 1f733af03141f068a540eec352589a89 # DV HLG
       - 27954b0a80aab882522a88a4d9eae1cd # DV SDR
-      - 6d0d8de7b57e35518ac0308b0ddf404e # DV
-      - bb019e1cd00f304f80971c965de064dc # HDR (undefined)
-      - 3e2c4e748b64a1a1118e0ea3f4cf6875 # HDR
-      - 3497799d29a085e2ac2df9d468413c94 # HDR10
       - a3d82cbef5039f8d295478d28a887159 # HDR10+
-      - 17e889ce13117940092308f48b48b45b # HLG
+      - 3497799d29a085e2ac2df9d468413c94 # HDR10
+      - 3e2c4e748b64a1a1118e0ea3f4cf6875 # HDR
+      - bb019e1cd00f304f80971c965de064dc # HDR (undefined)
       - 2a7e3be05d3861d6df7171ec74cad727 # PQ
-
-      # Unwanted
-      - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK
-      - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ
-      - 9b64dff695c2115facf1b6ea59c9bd07 # x265 (no HDR)
-      - fbcb31d8dabd2a319072b84fc0b7249c # Extras
-      - 83304f261cf516bb208c18c54c0adf97 # SDR (no WEBDL)
-      - 06d66ab109d4d2eddb2794d21526d140 # Retags
-      - e1a997ddb54e3ecbfe06341ad323c458 # Obfuscated
-      - 32b367365729d530ca1c124a0b180c64 # Bad Dual Groups
-      - 82d40da2bc6923f41e14394075dd4b03 # No-RlsGroup
+      - 17e889ce13117940092308f48b48b45b # HLG
       - 9b27ab6498ec0f31a3353992e19434ca # DV (WEBDL)
 
-      # Misc
+      # Miscellaneous
       - ec8fa7296b64e8cd390a1600981f3923 # Repack/Proper
       - eb3d5cc0a2be0db205fb823640db6a3c # Repack v2
       - 44e7c4de10ae50265753082e5dc76047 # Repack v3
+      - b735f09d3c025cbb7d75a5d38325b73b # Remaster
+      - 3bc5f395426614e155e585a2f056cdf1 # Season Pack
 
       # Streaming Services
       - d660701077794679fd59e8bdf4ce3a29 # AMZN
       - f67c9ca88f463a48346062e8ad07713f # ATVP
-      - 4e9a630db98d5391aec1368a0256e2fe # CRAV
+      - 77a7b25585c18af08f60b1547bb9b4fb # CC
       - 36b72f59f4ea20aad9316f475f2d9fbb # DCU
       - 89358767a60cc28783cdc3d0be9388a4 # DSNP
-      - 7a235133c87f7da4c8cccceca7e3c7a6 # HBO
       - a880d6abc21e7c16884f3ae393f84179 # HMAX
+      - 7a235133c87f7da4c8cccceca7e3c7a6 # HBO
       - f6cce30f1733d5c8194222a7507909bb # HULU
       - 0ac24a2a68a9700bcb7eeca8e5cd644c # iT
       - 81d1fbf600e2540cee87f3a23f9d3c1c # MAX
       - d34870697c9db575f17700212167be23 # NF
-      - b2b980877494b560443631eb1f473867 # NLZ
-      - fb1a91cdc0f26f7ca0696e0e95274645 # OViD
-      - 1656adc6d7bb2c8cca6acfb6592db421 # PCOK
       - c67a75ae4a1715f2bb4d492755ba4195 # PMTP
-      - 3ac5d84fce98bab1b531393e9c82f467 # QIBI
-      - c30d2958827d1867c73318a5a2957eb1 # RED
+      - 1656adc6d7bb2c8cca6acfb6592db421 # PCOK
       - ae58039e1319178e6be73caab5c42166 # SHO
       - 1efe8da11bfd74fbbcd4d8117ddb9213 # STAN
-      - 5d2317d99af813b6529c7ebf01c83533 # VDL
-      - 77a7b25585c18af08f60b1547bb9b4fb # CC
-      - 43b3cf48cb385cd3eac608ee6bca7f09 # UHD Streaming Boost
+      - 9623c5c9cac8e939c1b9aedd32f640bf # SYFY
+      - 9623c5c9cac8e939c1b9aedd32f640bf # UHD Streaming Boost
       - d2d299244a92b8a52d4921ce3897a256 # UHD Streaming Cut
 
-      # HQ Source Groups
+      # Release Group Tiers
+      - 9965a052eb87b0d10313b1cea89eb451 # Remux Tier 01
+      - 8a1d0c3d7497e741736761a1da866a2e # Remux Tier 02
+      - d6819cba26b1a6508138d25fb5e32293 # HD Bluray Tier 01
+      - c2216b7b8aa545dc1ce8388c618f8d57 # HD Bluray Tier 02
       - e6258996055b9fbab7e9cb2f75819294 # WEB Tier 01
       - 58790d4e2fdcd9733aa7ae68ba2bb503 # WEB Tier 02
       - d84935abd3f8556dcd51d4f27e22d0a6 # WEB Tier 03
       - d0c516558625b04b363fa6c5c2c7cfd4 # WEB Scene
-    quality_profiles:
-      - name: Web
 
-  - trash_ids:
-      - e0c1a67f23908a55b6ae9834e8ed6727 # Single Episode
-      - 4a20cfb76b5f92a8ca22b894b32e71be # Multi-Episode
-    quality_profiles:
+      # Unwanted
+      - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK
+      - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ
+      - e2315f990da2e2cbfc9fa5b7a6fcfe48 # LQ (Release Title)
+      - 9b64dff695c2115facf1b6ea59c9bd07 # x265 (no HDR/DV)
+      - 83304f261cf516bb208c18c54c0adf97 # SDR (no WEBDL)
+      - fbcb31d8dabd2a319072b84fc0b7249c # Extras
+      - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1
+      - 32b367365729d530ca1c124a0b180c64 # Bad Dual Groups
+      - 82d40da2bc6923f41e14394075dd4b03 # No-RlsGroup
+      - e1a997ddb54e3ecbfe06341ad323c458 # Obfuscated
+      - 06d66ab109d4d2eddb2794d21526d140 # Retags
+      - b735f09d3c025cbb7d75a5d38325b73b # Upscaled
+    assign_scores_to:
       - name: Web
-        score: -10000

ansible/roles/recyclarr/files/includes/sonarr-web-qualities.yml

@@ -0,0 +1,31 @@
+quality_profiles:
+  - name: Web
+    upgrade:
+      allowed: true
+      until_quality: 'WEB 2160p'
+      until_score: 10000
+    min_format_score: 0
+    score_set: default
+    quality_sort: top
+    qualities:
+      - name: 'WEB 2160p'
+        qualities:
+          - WEBDL-2160p
+          - WEBRip-2160p
+      - name: 'WEB 1080p'
+        qualities:
+          - WEBDL-1080p
+          - WEBRip-1080p
+      - name: HDTV-2160p
+      - name: Bluray-720p
+      - name: 'WEB 720p' 
+        qualities:
+          - WEBDL-720p
+          - WEBRip-720p
+      - name: HDTV-1080p
+      - name: HDTV-720p
+      - name: 'WEB 480p'
+        qualities:
+          - WEBDL-480p
+          - WEBRip-480p
+      - name: SDTV

ansible/roles/recyclarr/files/includes/sonarr-web_season_pack-custom_formats.yml

@@ -0,0 +1,74 @@
+custom_formats:
+  - trash_ids:
+      # HDR Formats
+      - 2b239ed870daba8126a53bd5dc8dc1c8 # DV HDR10+
+      - 7878c33f1963fefb3d6c8657d46c2f0a # DV HDR10
+      - 6d0d8de7b57e35518ac0308b0ddf404e # DV
+      - 1f733af03141f068a540eec352589a89 # DV HLG
+      - 27954b0a80aab882522a88a4d9eae1cd # DV SDR
+      - a3d82cbef5039f8d295478d28a887159 # HDR10+
+      - 3497799d29a085e2ac2df9d468413c94 # HDR10
+      - 3e2c4e748b64a1a1118e0ea3f4cf6875 # HDR
+      - bb019e1cd00f304f80971c965de064dc # HDR (undefined)
+      - 2a7e3be05d3861d6df7171ec74cad727 # PQ
+      - 17e889ce13117940092308f48b48b45b # HLG
+      - 9b27ab6498ec0f31a3353992e19434ca # DV (WEBDL)
+
+      # Miscellaneous
+      - ec8fa7296b64e8cd390a1600981f3923 # Repack/Proper
+      - eb3d5cc0a2be0db205fb823640db6a3c # Repack v2
+      - 44e7c4de10ae50265753082e5dc76047 # Repack v3
+      - b735f09d3c025cbb7d75a5d38325b73b # Remaster
+      - 3bc5f395426614e155e585a2f056cdf1 # Season Pack
+
+      # Streaming Services
+      - d660701077794679fd59e8bdf4ce3a29 # AMZN
+      - f67c9ca88f463a48346062e8ad07713f # ATVP
+      - 77a7b25585c18af08f60b1547bb9b4fb # CC
+      - 36b72f59f4ea20aad9316f475f2d9fbb # DCU
+      - 89358767a60cc28783cdc3d0be9388a4 # DSNP
+      - a880d6abc21e7c16884f3ae393f84179 # HMAX
+      - 7a235133c87f7da4c8cccceca7e3c7a6 # HBO
+      - f6cce30f1733d5c8194222a7507909bb # HULU
+      - 0ac24a2a68a9700bcb7eeca8e5cd644c # iT
+      - 81d1fbf600e2540cee87f3a23f9d3c1c # MAX
+      - d34870697c9db575f17700212167be23 # NF
+      - c67a75ae4a1715f2bb4d492755ba4195 # PMTP
+      - 1656adc6d7bb2c8cca6acfb6592db421 # PCOK
+      - ae58039e1319178e6be73caab5c42166 # SHO
+      - 1efe8da11bfd74fbbcd4d8117ddb9213 # STAN
+      - 9623c5c9cac8e939c1b9aedd32f640bf # SYFY
+      - 9623c5c9cac8e939c1b9aedd32f640bf # UHD Streaming Boost
+      - d2d299244a92b8a52d4921ce3897a256 # UHD Streaming Cut
+
+      # Release Group Tiers
+      - 9965a052eb87b0d10313b1cea89eb451 # Remux Tier 01
+      - 8a1d0c3d7497e741736761a1da866a2e # Remux Tier 02
+      - d6819cba26b1a6508138d25fb5e32293 # HD Bluray Tier 01
+      - c2216b7b8aa545dc1ce8388c618f8d57 # HD Bluray Tier 02
+      - e6258996055b9fbab7e9cb2f75819294 # WEB Tier 01
+      - 58790d4e2fdcd9733aa7ae68ba2bb503 # WEB Tier 02
+      - d84935abd3f8556dcd51d4f27e22d0a6 # WEB Tier 03
+      - d0c516558625b04b363fa6c5c2c7cfd4 # WEB Scene
+
+      # Unwanted
+      - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK
+      - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ
+      - e2315f990da2e2cbfc9fa5b7a6fcfe48 # LQ (Release Title)
+      - 9b64dff695c2115facf1b6ea59c9bd07 # x265 (no HDR/DV)
+      - 83304f261cf516bb208c18c54c0adf97 # SDR (no WEBDL)
+      - fbcb31d8dabd2a319072b84fc0b7249c # Extras
+      - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1
+      - 32b367365729d530ca1c124a0b180c64 # Bad Dual Groups
+      - 82d40da2bc6923f41e14394075dd4b03 # No-RlsGroup
+      - e1a997ddb54e3ecbfe06341ad323c458 # Obfuscated
+      - 06d66ab109d4d2eddb2794d21526d140 # Retags
+      - b735f09d3c025cbb7d75a5d38325b73b # Upscaled
+    assign_scores_to:
+      - name: 'Web - Season Pack'
+
+  - trash_ids:
+      - e0c1a67f23908a55b6ae9834e8ed6727 # Single Episode
+    assign_scores_to:
+      - name: 'Web - Season Pack'
+        score: -10000

ansible/roles/recyclarr/files/includes/sonarr-web_season_pack-qualities.yml

@@ -0,0 +1,31 @@
+quality_profiles:
+  - name: 'Web - Season Pack'
+    upgrade:
+      allowed: true
+      until_quality: 'WEB 2160p'
+      until_score: 10000
+    min_format_score: 0
+    score_set: default
+    quality_sort: top
+    qualities:
+      - name: 'WEB 2160p'
+        qualities:
+          - WEBDL-2160p
+          - WEBRip-2160p
+      - name: 'WEB 1080p'
+        qualities:
+          - WEBDL-1080p
+          - WEBRip-1080p
+      - name: HDTV-2160p
+      - name: Bluray-720p
+      - name: 'WEB 720p' 
+        qualities:
+          - WEBDL-720p
+          - WEBRip-720p
+      - name: HDTV-1080p
+      - name: HDTV-720p
+      - name: 'WEB 480p'
+        qualities:
+          - WEBDL-480p
+          - WEBRip-480p
+      - name: SDTV

ansible/roles/recyclarr/handlers/main.yml

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

ansible/roles/recyclarr/tasks/main.yml

@@ -30,18 +30,21 @@
     mode: "{{ docker_compose_directory_mask }}"
   become: true
 
-- name: Install main configuration
+- name: Install main configuration files
   template:
-    src: recyclarr.yml
-    dest: "{{ data_dir }}/recyclarr/configs"
+    src: "{{ item }}"
+    dest: "{{ data_dir }}/recyclarr/configs/"
     owner: "{{ service_user.uid }}"
+  loop:
+    - sonarr.yml
+    - radarr.yml
   become: true
   notify: restart recyclarr
 
 - name: Install config includes
   copy:
     src: includes/
-    dest: "{{ data_dir }}/recyclarr/configs/includes"
+    dest: "{{ data_dir }}/recyclarr/includes/"
   become: true
   notify: restart recyclarr
 

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

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   starr:
@@ -7,8 +6,9 @@ networks:
 services:
   recyclarr:
     container_name: recyclarr
-    image: ghcr.io/recyclarr/recyclarr:7
+    image: ghcr.io/recyclarr/recyclarr:8
     restart: unless-stopped
+    security_opt: ['no-new-privileges:true'] # Prevents privilege escalation - https://recyclarr.dev/wiki/installation/docker/#prevent-in-container-privilege-escalation
     user: "{{ service_user.uid }}:{{ service_user.uid }}"
     networks:
       - starr

ansible/roles/recyclarr/templates/radarr.yml

@@ -0,0 +1,39 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/recyclarr/recyclarr/master/schemas/config-schema.json
+radarr:
+  movies:
+    base_url: "https://radarr.local.{{ personal_domain }}"
+    api_key: "{{ radarr_api_key }}"
+    delete_old_custom_formats: true
+    replace_existing_custom_formats: true
+    media_naming:
+      folder: jellyfin-tmdb
+      movie:
+        rename: true
+        standard: default
+
+    include:
+      - template: radarr-quality-definition-movie
+
+      # Remux
+      - config: radarr-remux-qualities.yml
+      - config: radarr-remux-custom_formats.yml
+    
+      # Encode
+      - config: radarr-encode-qualities.yml
+      - config: radarr-encode-custom_formats.yml
+
+      # Web
+      - config: radarr-web-qualities.yml
+      - config: radarr-web-custom_formats.yml
+
+      # Old
+      - config: radarr-old-qualities.yml
+      - config: radarr-old-custom_formats.yml
+
+      # Anime
+      - config: radarr-anime-qualities.yml
+      - config: radarr-anime-custom_formats.yml
+
+      # Not 4k
+      - config: radarr-not_4k-qualities.yml
+      - config: radarr-not_4k-qualities.yml

ansible/roles/recyclarr/templates/recyclarr.yml

@@ -1,56 +0,0 @@
-sonarr:
-  series:
-    base_url: "https://sonarr.local.{{ personal_domain }}"
-    api_key: "{{ sonarr_api_key }}"
-    delete_old_custom_formats: true
-    quality_definition:
-      type: series
-    media_naming:
-      series: plex
-      season: default
-      episodes:
-        rename: true
-        standard: default
-        daily: default
-        anime: default
-    include:
-      # Remux Quality Profile
-      - config: includes/qualities/sonarr-remux-qualities.yml
-      - config: includes/sonarr-remux.yml
-      # Web Quality Profile
-      - config: includes/qualities/sonarr-web-qualities.yml
-      - config: includes/sonarr-web.yml
-      # Season Pack Profile
-      - config: includes/qualities/sonarr-seasonpack-qualities.yml
-      - config: includes/sonarr-seasonpack.yml
-      # Anime Quality Profile
-      - config: includes/qualities/sonarr-anime-qualities.yml
-      - config: includes/sonarr-anime.yml
-
-
-radarr:
-  movies:
-    base_url: "https://radarr.local.{{ personal_domain }}"
-    api_key: "{{ radarr_api_key }}"
-    delete_old_custom_formats: true
-    quality_definition:
-      type: movie
-    media_naming:
-      folder: plex
-      movie:
-        rename: true
-        standard: anime
-    include:
-      # Remux Quality Profile
-      - config: includes/qualities/radarr-remux-qualities.yml
-      - config: includes/radarr-remux.yml
-      # Web Quality Profile
-      - config: includes/qualities/radarr-web-qualities.yml
-      - config: includes/radarr-web.yml
-      # Anime Quality Profile
-      - config: includes/qualities/radarr-anime-qualities.yml
-      - config: includes/radarr-anime.yml
-      # Not 4k Quality Profile
-      - config: includes/qualities/radarr-not4k-qualities.yml
-      - config: includes/radarr-not4k.yml
-

ansible/roles/recyclarr/templates/sonarr.yml

@@ -0,0 +1,46 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/recyclarr/recyclarr/master/schemas/config-schema.json
+sonarr:
+  tv:
+    base_url: "https://sonarr.local.{{ personal_domain }}"
+    api_key: "{{ sonarr_api_key }}"
+    delete_old_custom_formats: true
+    replace_existing_custom_formats: true
+    media_naming:
+      series: jellyfin-tvdb
+      season: default
+      episodes:
+        rename: true
+        standard: default
+        daily: default
+        anime: default
+
+    include:
+      - template: sonarr-quality-definition-anime
+
+      # Remux
+      - config: sonarr-remux-qualities.yml
+      - config: sonarr-remux-custom_formats.yml
+
+      # Remux - Season Pack
+      - config: sonarr-remux_season_pack-qualities.yml
+      - config: sonarr-remux_season_pack-custom_formats.yml
+
+      # Web
+      - config: sonarr-web-qualities.yml
+      - config: sonarr-web-custom_formats.yml
+
+      # Web - Season Pack
+      - config: sonarr-web_season_pack-qualities.yml
+      - config: sonarr-web_season_pack-custom_formats.yml
+
+      # Anime
+      - config: sonarr-anime-qualities.yml
+      - config: sonarr-anime-custom_formats.yml
+
+      # Old
+      - config: sonarr-old-qualities.yml
+      - config: sonarr-old-custom_formats.yml
+
+      # Old - Season Pack
+      - config: sonarr-old_season_pack-qualities.yml
+      - config: sonarr-old_season_pack-custom_formats.yml

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

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

ansible/roles/renovate/tasks/main.yml

@@ -1,29 +0,0 @@
-- name: Create install directory
-  file:
-    path: "{{ install_directory }}/{{ role_name }}"
-    state: directory
-    owner: "{{ docker_user }}"
-    mode: "{{ docker_compose_directory_mask }}"
-  become: true
-
-- name: Copy docker-compose file to destination
-  template:
-    src: docker-compose.yml
-    dest: "{{ install_directory }}/{{ role_name }}/docker-compose.yml"
-    owner: "{{ docker_user }}"
-    mode: "{{ docker_compose_file_mask }}"
-    validate: docker compose -f %s config
-  become: true
-
-- name: Copy config.js to destination
-  template:
-    src: config.js
-    dest: "{{ install_directory }}/renovate/config.js"
-    mode: "{{ docker_compose_file_mask }}"
-  become: true
-
-- name: Start docker container
-  community.docker.docker_compose_v2:
-    project_src: "{{ install_directory }}/{{ role_name }}"
-    pull: always
-    remove_orphans: yes

ansible/roles/renovate/templates/config.js

@@ -1,14 +0,0 @@
-module.exports = {
-  endpoint: "git.{{ personal_domain }}/api/v2",
-  token: '{{ renovate_gitea_token }}',
-  platform: 'gitea',
-  dryRun: true,
-  autodiscover: true,
-  onboarding: false,
-  redisUrl: 'redis://redis',
-  repositoryCache: 'enabled',
-  persistRepoData: true,
-  binarySource: "docker",
-  dockerUser: "{{ primary_uid }}",
-  baseDir: "{{ data_dir }}/renovate",
-};

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

@@ -1,27 +0,0 @@
-version: "{{ docker_compose_version }}"
-
-networks:
-  docker-socket-proxy:
-    external: true
-
-services:
-  renovate:
-    container_name: renovate
-    image: renovate/renovate:slim
-    restart: unless-stopped
-    depends_on:
-      - redis
-    networks:
-      - docker-socket-proxy
-    user: "{{ service_user.uid }}:{{ service_user.group }}"
-    environment:
-      - TZ={{ timezone }}
-      - DOCKER_HOST=tcp://docker_socket_proxy:2375
-      - "RENOVATE_TOKEN={{ renovate_gitea_token }}"
-    volumes:
-      - "{{ data_dir }}/renovate:/{{ data_dir }}/renovate" # These must be the same
-      - ./config.js:/usr/src/app/config.js:ro
-
-  redis:
-    image: redis:7-alpine
-    restart: unless-stopped

ansible/roles/renovate/vars/main.yml

@@ -1,8 +0,0 @@
-renovate_gitea_token: !vault |
-  $ANSIBLE_VAULT;1.1;AES256
-  61383064643566343633633962376238346137633933643634353564316266656338333665613235
-  3230613339633561313064393163393537623763393336300a383332626538376335613763313439
-  64326566393761666266303438313435346535626231376661653863663664623839663431363632
-  6434306532613065650a636562663030363162396435346262353839653736343530393365633331
-  65366534333234353239376566326234666566303038396661343137316265306433313235366530
-  6164656437346131376165613136363161646437343038393266

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

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

ansible/roles/sabnzbd/tasks/main.yml

@@ -1,31 +0,0 @@
-- name: Create service user
-  user:
-    name: "{{ role_name }}"
-    groups: "{{ media_group }}"
-    append: yes
-    system: true
-  register: service_user
-  become: true
-
-- name: Create install directory
-  file:
-    path: "{{ install_directory }}/{{ role_name }}"
-    state: directory
-    owner: "{{ docker_user }}"
-    mode: "{{ docker_compose_directory_mask }}"
-  become: true
-
-- name: Copy docker-compose file to destination
-  template:
-    src: docker-compose.yml
-    dest: "{{ install_directory }}/{{ role_name }}/docker-compose.yml"
-    owner: "{{ docker_user }}"
-    mode: "{{ docker_compose_file_mask }}"
-    validate: docker compose -f %s config
-  become: true
-
-- name: Start docker containers
-  community.docker.docker_compose_v2:
-    project_src: "{{ install_directory }}/{{ role_name }}"
-    pull: always
-    remove_orphans: yes

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

@@ -1,26 +0,0 @@
-version: "{{ docker_compose_version }}"
-
-networks:
-  traefik:
-    external: true
-
-services:
-  sabnzbd:
-    container_name: sabnzbd
-    image: lscr.io/linuxserver/sabnzbd:latest
-    restart: unless-stopped
-    networks:
-      - traefik
-    environment:
-      - "PUID={{ service_user.uid }}"
-      - "PGID={{ media_gid }}"
-      - "TZ={{ timezone }}"
-      - "UMASK=002"
-    volumes:
-      - "{{ data_dir }}/{{ role_name }}:/config"
-      - "{{ media_storage_mnt }}/data/usenet:/data/usenet"
-    labels:
-      traefik.enable: true
-      traefik.http.routers.{{ role_name }}.rule: "Host(`{{ role_name }}.local.{{ personal_domain }}`)"
-      traefik.http.routers.{{ role_name }}.middlewares: lan-whitelist@file
-      traefik.http.services.sabnzbd.loadbalancer.server.port: 8080

ansible/roles/searxng/files/hostnames/blacklist.yml

@@ -0,0 +1 @@
+'(.*\.)?pinterest.com$'

ansible/roles/searxng/handlers/main.yml

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

ansible/roles/searxng/tasks/main.yml

@@ -23,6 +23,14 @@
   become: true
   notify: restart searxng
 
+- name: Copy hostname lists to destination
+  copy:
+    src: hostnames/
+    dest: "{{ data_dir }}/{{ role_name }}/"
+    owner: "{{ docker_user }}"
+  become: true
+  notify: restart searxng
+
 - name: Start docker container
   community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"

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

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:
@@ -7,10 +6,11 @@ networks:
 services:
   searxng:
     container_name: searxng
-    image: searxng/searxng
+    image: ghcr.io/searxng/searxng
     restart: unless-stopped
     networks:
       - traefik
+      - default
     volumes:
       - "{{ data_dir }}/{{ role_name }}:/etc/searxng"
     cap_drop:
@@ -22,7 +22,7 @@ services:
     labels:
       traefik.enable: true
       traefik.http.routers.searxng.rule: "Host(`search.{{ personal_domain }}`)"
-        #traefik.http.routers.searxng.middlewares: lan-whitelist@file
+      traefik.http.routers.searxng.middlewares: lan-whitelist@file
 
   redis:
     image: redis:alpine