From c1f6315c0259b14137259549825de77d7a96c17a Mon Sep 17 00:00:00 2001 From: Mike Wilson Date: Tue, 22 Apr 2025 13:33:59 -0400 Subject: [PATCH] Move recyclarr includes to subdirectory --- .../{ => includes}/radarr-anime-custom_formats.yml | 0 .../files/{ => includes}/radarr-anime-qualities.yml | 0 .../{ => includes}/radarr-not_4k-custom_formats.yml | 0 .../files/{ => includes}/radarr-not_4k-qualities.yml | 0 .../{ => includes}/radarr-old-custom_formats.yml | 0 .../files/{ => includes}/radarr-old-qualities.yml | 0 .../{ => includes}/radarr-remux-custom_formats.yml | 0 .../files/{ => includes}/radarr-remux-qualities.yml | 0 .../{ => includes}/radarr-web-custom_formats.yml | 0 .../files/{ => includes}/radarr-web-qualities.yml | 0 .../{ => includes}/sonarr-anime-custom_formats.yml | 0 .../files/{ => includes}/sonarr-anime-qualities.yml | 0 .../{ => includes}/sonarr-old-custom_formats.yml | 0 .../files/{ => includes}/sonarr-old-qualities.yml | 0 .../sonarr-old_season_pack-custom_formats.yml | 0 .../sonarr-old_season_pack-qualities.yml | 0 .../{ => includes}/sonarr-remux-custom_formats.yml | 0 .../files/{ => includes}/sonarr-remux-qualities.yml | 0 .../sonarr-remux_season_pack-custom_formats.yml | 0 .../sonarr-remux_season_pack-qualities.yml | 0 .../{ => includes}/sonarr-web-custom_formats.yml | 0 .../files/{ => includes}/sonarr-web-qualities.yml | 0 .../sonarr-web_season_pack-custom_formats.yml | 0 .../sonarr-web_season_pack-qualities.yml | 0 ansible/roles/recyclarr/tasks/main.yml | 11 +++++++---- ansible/roles/recyclarr/templates/radarr.yml | 2 +- 26 files changed, 8 insertions(+), 5 deletions(-) rename ansible/roles/recyclarr/files/{ => includes}/radarr-anime-custom_formats.yml (100%) rename ansible/roles/recyclarr/files/{ => includes}/radarr-anime-qualities.yml (100%) rename ansible/roles/recyclarr/files/{ => includes}/radarr-not_4k-custom_formats.yml (100%) rename ansible/roles/recyclarr/files/{ => includes}/radarr-not_4k-qualities.yml (100%) rename ansible/roles/recyclarr/files/{ => includes}/radarr-old-custom_formats.yml (100%) rename ansible/roles/recyclarr/files/{ => includes}/radarr-old-qualities.yml (100%) rename ansible/roles/recyclarr/files/{ => includes}/radarr-remux-custom_formats.yml (100%) rename ansible/roles/recyclarr/files/{ => includes}/radarr-remux-qualities.yml (100%) rename ansible/roles/recyclarr/files/{ => includes}/radarr-web-custom_formats.yml (100%) rename ansible/roles/recyclarr/files/{ => includes}/radarr-web-qualities.yml (100%) rename ansible/roles/recyclarr/files/{ => includes}/sonarr-anime-custom_formats.yml (100%) rename ansible/roles/recyclarr/files/{ => includes}/sonarr-anime-qualities.yml (100%) rename ansible/roles/recyclarr/files/{ => includes}/sonarr-old-custom_formats.yml (100%) rename ansible/roles/recyclarr/files/{ => includes}/sonarr-old-qualities.yml (100%) rename ansible/roles/recyclarr/files/{ => includes}/sonarr-old_season_pack-custom_formats.yml (100%) rename ansible/roles/recyclarr/files/{ => includes}/sonarr-old_season_pack-qualities.yml (100%) rename ansible/roles/recyclarr/files/{ => includes}/sonarr-remux-custom_formats.yml (100%) rename ansible/roles/recyclarr/files/{ => includes}/sonarr-remux-qualities.yml (100%) rename ansible/roles/recyclarr/files/{ => includes}/sonarr-remux_season_pack-custom_formats.yml (100%) rename ansible/roles/recyclarr/files/{ => includes}/sonarr-remux_season_pack-qualities.yml (100%) rename ansible/roles/recyclarr/files/{ => includes}/sonarr-web-custom_formats.yml (100%) rename ansible/roles/recyclarr/files/{ => includes}/sonarr-web-qualities.yml (100%) rename ansible/roles/recyclarr/files/{ => includes}/sonarr-web_season_pack-custom_formats.yml (100%) rename ansible/roles/recyclarr/files/{ => includes}/sonarr-web_season_pack-qualities.yml (100%) diff --git a/ansible/roles/recyclarr/files/radarr-anime-custom_formats.yml b/ansible/roles/recyclarr/files/includes/radarr-anime-custom_formats.yml similarity index 100% rename from ansible/roles/recyclarr/files/radarr-anime-custom_formats.yml rename to ansible/roles/recyclarr/files/includes/radarr-anime-custom_formats.yml diff --git a/ansible/roles/recyclarr/files/radarr-anime-qualities.yml b/ansible/roles/recyclarr/files/includes/radarr-anime-qualities.yml similarity index 100% rename from ansible/roles/recyclarr/files/radarr-anime-qualities.yml rename to ansible/roles/recyclarr/files/includes/radarr-anime-qualities.yml diff --git a/ansible/roles/recyclarr/files/radarr-not_4k-custom_formats.yml b/ansible/roles/recyclarr/files/includes/radarr-not_4k-custom_formats.yml similarity index 100% rename from ansible/roles/recyclarr/files/radarr-not_4k-custom_formats.yml rename to ansible/roles/recyclarr/files/includes/radarr-not_4k-custom_formats.yml diff --git a/ansible/roles/recyclarr/files/radarr-not_4k-qualities.yml b/ansible/roles/recyclarr/files/includes/radarr-not_4k-qualities.yml similarity index 100% rename from ansible/roles/recyclarr/files/radarr-not_4k-qualities.yml rename to ansible/roles/recyclarr/files/includes/radarr-not_4k-qualities.yml diff --git a/ansible/roles/recyclarr/files/radarr-old-custom_formats.yml b/ansible/roles/recyclarr/files/includes/radarr-old-custom_formats.yml similarity index 100% rename from ansible/roles/recyclarr/files/radarr-old-custom_formats.yml rename to ansible/roles/recyclarr/files/includes/radarr-old-custom_formats.yml diff --git a/ansible/roles/recyclarr/files/radarr-old-qualities.yml b/ansible/roles/recyclarr/files/includes/radarr-old-qualities.yml similarity index 100% rename from ansible/roles/recyclarr/files/radarr-old-qualities.yml rename to ansible/roles/recyclarr/files/includes/radarr-old-qualities.yml diff --git a/ansible/roles/recyclarr/files/radarr-remux-custom_formats.yml b/ansible/roles/recyclarr/files/includes/radarr-remux-custom_formats.yml similarity index 100% rename from ansible/roles/recyclarr/files/radarr-remux-custom_formats.yml rename to ansible/roles/recyclarr/files/includes/radarr-remux-custom_formats.yml diff --git a/ansible/roles/recyclarr/files/radarr-remux-qualities.yml b/ansible/roles/recyclarr/files/includes/radarr-remux-qualities.yml similarity index 100% rename from ansible/roles/recyclarr/files/radarr-remux-qualities.yml rename to ansible/roles/recyclarr/files/includes/radarr-remux-qualities.yml diff --git a/ansible/roles/recyclarr/files/radarr-web-custom_formats.yml b/ansible/roles/recyclarr/files/includes/radarr-web-custom_formats.yml similarity index 100% rename from ansible/roles/recyclarr/files/radarr-web-custom_formats.yml rename to ansible/roles/recyclarr/files/includes/radarr-web-custom_formats.yml diff --git a/ansible/roles/recyclarr/files/radarr-web-qualities.yml b/ansible/roles/recyclarr/files/includes/radarr-web-qualities.yml similarity index 100% rename from ansible/roles/recyclarr/files/radarr-web-qualities.yml rename to ansible/roles/recyclarr/files/includes/radarr-web-qualities.yml diff --git a/ansible/roles/recyclarr/files/sonarr-anime-custom_formats.yml b/ansible/roles/recyclarr/files/includes/sonarr-anime-custom_formats.yml similarity index 100% rename from ansible/roles/recyclarr/files/sonarr-anime-custom_formats.yml rename to ansible/roles/recyclarr/files/includes/sonarr-anime-custom_formats.yml diff --git a/ansible/roles/recyclarr/files/sonarr-anime-qualities.yml b/ansible/roles/recyclarr/files/includes/sonarr-anime-qualities.yml similarity index 100% rename from ansible/roles/recyclarr/files/sonarr-anime-qualities.yml rename to ansible/roles/recyclarr/files/includes/sonarr-anime-qualities.yml diff --git a/ansible/roles/recyclarr/files/sonarr-old-custom_formats.yml b/ansible/roles/recyclarr/files/includes/sonarr-old-custom_formats.yml similarity index 100% rename from ansible/roles/recyclarr/files/sonarr-old-custom_formats.yml rename to ansible/roles/recyclarr/files/includes/sonarr-old-custom_formats.yml diff --git a/ansible/roles/recyclarr/files/sonarr-old-qualities.yml b/ansible/roles/recyclarr/files/includes/sonarr-old-qualities.yml similarity index 100% rename from ansible/roles/recyclarr/files/sonarr-old-qualities.yml rename to ansible/roles/recyclarr/files/includes/sonarr-old-qualities.yml diff --git a/ansible/roles/recyclarr/files/sonarr-old_season_pack-custom_formats.yml b/ansible/roles/recyclarr/files/includes/sonarr-old_season_pack-custom_formats.yml similarity index 100% rename from ansible/roles/recyclarr/files/sonarr-old_season_pack-custom_formats.yml rename to ansible/roles/recyclarr/files/includes/sonarr-old_season_pack-custom_formats.yml diff --git a/ansible/roles/recyclarr/files/sonarr-old_season_pack-qualities.yml b/ansible/roles/recyclarr/files/includes/sonarr-old_season_pack-qualities.yml similarity index 100% rename from ansible/roles/recyclarr/files/sonarr-old_season_pack-qualities.yml rename to ansible/roles/recyclarr/files/includes/sonarr-old_season_pack-qualities.yml diff --git a/ansible/roles/recyclarr/files/sonarr-remux-custom_formats.yml b/ansible/roles/recyclarr/files/includes/sonarr-remux-custom_formats.yml similarity index 100% rename from ansible/roles/recyclarr/files/sonarr-remux-custom_formats.yml rename to ansible/roles/recyclarr/files/includes/sonarr-remux-custom_formats.yml diff --git a/ansible/roles/recyclarr/files/sonarr-remux-qualities.yml b/ansible/roles/recyclarr/files/includes/sonarr-remux-qualities.yml similarity index 100% rename from ansible/roles/recyclarr/files/sonarr-remux-qualities.yml rename to ansible/roles/recyclarr/files/includes/sonarr-remux-qualities.yml diff --git a/ansible/roles/recyclarr/files/sonarr-remux_season_pack-custom_formats.yml b/ansible/roles/recyclarr/files/includes/sonarr-remux_season_pack-custom_formats.yml similarity index 100% rename from ansible/roles/recyclarr/files/sonarr-remux_season_pack-custom_formats.yml rename to ansible/roles/recyclarr/files/includes/sonarr-remux_season_pack-custom_formats.yml diff --git a/ansible/roles/recyclarr/files/sonarr-remux_season_pack-qualities.yml b/ansible/roles/recyclarr/files/includes/sonarr-remux_season_pack-qualities.yml similarity index 100% rename from ansible/roles/recyclarr/files/sonarr-remux_season_pack-qualities.yml rename to ansible/roles/recyclarr/files/includes/sonarr-remux_season_pack-qualities.yml diff --git a/ansible/roles/recyclarr/files/sonarr-web-custom_formats.yml b/ansible/roles/recyclarr/files/includes/sonarr-web-custom_formats.yml similarity index 100% rename from ansible/roles/recyclarr/files/sonarr-web-custom_formats.yml rename to ansible/roles/recyclarr/files/includes/sonarr-web-custom_formats.yml diff --git a/ansible/roles/recyclarr/files/sonarr-web-qualities.yml b/ansible/roles/recyclarr/files/includes/sonarr-web-qualities.yml similarity index 100% rename from ansible/roles/recyclarr/files/sonarr-web-qualities.yml rename to ansible/roles/recyclarr/files/includes/sonarr-web-qualities.yml diff --git a/ansible/roles/recyclarr/files/sonarr-web_season_pack-custom_formats.yml b/ansible/roles/recyclarr/files/includes/sonarr-web_season_pack-custom_formats.yml similarity index 100% rename from ansible/roles/recyclarr/files/sonarr-web_season_pack-custom_formats.yml rename to ansible/roles/recyclarr/files/includes/sonarr-web_season_pack-custom_formats.yml diff --git a/ansible/roles/recyclarr/files/sonarr-web_season_pack-qualities.yml b/ansible/roles/recyclarr/files/includes/sonarr-web_season_pack-qualities.yml similarity index 100% rename from ansible/roles/recyclarr/files/sonarr-web_season_pack-qualities.yml rename to ansible/roles/recyclarr/files/includes/sonarr-web_season_pack-qualities.yml diff --git a/ansible/roles/recyclarr/tasks/main.yml b/ansible/roles/recyclarr/tasks/main.yml index 1e8e1f2..f3753c4 100644 --- a/ansible/roles/recyclarr/tasks/main.yml +++ b/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 diff --git a/ansible/roles/recyclarr/templates/radarr.yml b/ansible/roles/recyclarr/templates/radarr.yml index 6134f82..0892f30 100644 --- a/ansible/roles/recyclarr/templates/radarr.yml +++ b/ansible/roles/recyclarr/templates/radarr.yml @@ -1,7 +1,7 @@ radarr: movies: base_url: "https://radarr.local.{{ personal_domain }}" - api_key: "{{ radarr_api_key }" + api_key: "{{ radarr_api_key }}" delete_old_custom_formats: true replace_existing_custom_formats: true media_naming: