From 28f38585ab03adcee20535da674303cac0698193 Mon Sep 17 00:00:00 2001 From: Scott Cariss Date: Mon, 15 Apr 2019 16:38:08 +0100 Subject: [PATCH 1/4] Change all text instances of sickrage to sickchill --- README.md | 4 ++-- docs/configuration/application_ports.md | 4 ++-- docs/index.md | 2 +- group_vars/all.yml.dist | 16 +++++++------- nas.yml | 8 +++---- tasks/sickrage.yml | 28 ++++++++++++------------- templates/traefik/traefik.toml | 4 ++-- 7 files changed, 33 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index 7ffd43c1..f7bb9cb4 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ just a stock Ubuntu install, some clever Ansible config and a bunch of Docker co * An awesome dashboard to your home server (Heimdall) * Any number of Samba shares for you to store your stuff * A BitTorrent client -* Various media management tools - Sonarr, Sickrage, CouchPotato, Radarr +* Various media management tools - Sonarr, Sickchill, CouchPotato, Radarr * Media streaming via Plex or Emby * Music streaming with Airsonic * An RSS newsfeed reader - Miniflux @@ -47,7 +47,7 @@ just a stock Ubuntu install, some clever Ansible config and a bunch of Docker co * [Plex](https://www.plex.tv/) - Plex Media Server * [Portainer](https://portainer.io/) - for managing Docker and running custom images * [Radarr](https://radarr.video/) - for organising and downloading movies -* [Sickrage](https://sickrage.github.io/) - for managing TV episodes +* [Sickchill](https://sickchill.github.io/) - for managing TV episodes * [Sonarr](https://sonarr.tv/) - for downloading and managing TV episodes * [Tautulli](http://tautulli.com/) - Monitor Your Plex Media Server * [Telegraf](https://github.com/influxdata/telegraf) - Metrics collection agent diff --git a/docs/configuration/application_ports.md b/docs/configuration/application_ports.md index 090bd7a7..f3f0569a 100644 --- a/docs/configuration/application_ports.md +++ b/docs/configuration/application_ports.md @@ -26,11 +26,11 @@ By default, applications can be found on the ports listed below. | Plex | 32400 | | | Portainer | 9000 | | | Radarr | 7878 | | -| Sickrage | 8081 | | +| Sickchill | 8081 | | | Sonarr | 8989 | | | Tautulli | 8181 | | | The Lounge | 9000 | | | Traefik | 8083 | | | Transmission | 9091 | with VPN | | Transmission | 9092 | | -| ZNC | 6677 | | \ No newline at end of file +| ZNC | 6677 | | diff --git a/docs/index.md b/docs/index.md index 22f84dc1..2d4550cc 100644 --- a/docs/index.md +++ b/docs/index.md @@ -9,7 +9,7 @@ Ansible config and a bunch of Docker containers. Ansible-NAS was born! * An awesome dashboard to your home server (Heimdall) * Any number of Samba shares for you to store your stuff * A BitTorrent client -* Various media management tools - Sonarr, Sickrage, CouchPotato, Radarr +* Various media management tools - Sonarr, Sickchill, CouchPotato, Radarr * Media streaming via Plex, Emby or MiniDLNA * Music streaming with Airsonic * A Dropbox replacement via Nextcloud diff --git a/group_vars/all.yml.dist b/group_vars/all.yml.dist index 1a8e9bf4..969cbe69 100644 --- a/group_vars/all.yml.dist +++ b/group_vars/all.yml.dist @@ -28,7 +28,7 @@ minidlna_enabled: false # Media Sourcing sonarr_enabled: false -sickrage_enabled: false +sickchill_enabled: false couchpotato_enabled: false radarr_enabled: false get_iplayer_enabled: false @@ -343,14 +343,14 @@ couchpotato_group_id: 0 ### -### Sickrage +### Sickchill ### -sickrage_available_externally: "false" -sickrage_config_directory: "{{ docker_home }}/sickrage/config" -sickrage_tv_directory: "{{ tv_root }}" -sickrage_downloads_directory: "{{ downloads_root }}" -sickrage_user_id: 0 -sickrage_group_id: 0 +sickchill_available_externally: "false" +sickchill_config_directory: "{{ docker_home }}/sickchill/config" +sickchill_tv_directory: "{{ tv_root }}" +sickchill_downloads_directory: "{{ downloads_root }}" +sickchill_user_id: 0 +sickchill_group_id: 0 ### ### Netdata diff --git a/nas.yml b/nas.yml index d4bc0e46..7f815e2f 100644 --- a/nas.yml +++ b/nas.yml @@ -87,9 +87,9 @@ when: (couchpotato_enabled | default(False)) tags: couchpotato - - import_tasks: tasks/sickrage.yml - when: (sickrage_enabled | default(False)) - tags: sickrage + - import_tasks: tasks/sickchill.yml + when: (sickchill_enabled | default(False)) + tags: sickchill - import_tasks: tasks/znc.yml when: (znc_enabled | default(False)) @@ -145,4 +145,4 @@ - import_tasks: tasks/bitwarden.yml when: (bitwarden_enabled | default(False)) - tags: bitwarden \ No newline at end of file + tags: bitwarden diff --git a/tasks/sickrage.yml b/tasks/sickrage.yml index ae4e79a3..ad3ee029 100644 --- a/tasks/sickrage.yml +++ b/tasks/sickrage.yml @@ -1,31 +1,31 @@ --- -- name: Create Sickrage Directories +- name: Create Sickchill Directories file: path: "{{ item }}" state: directory # mode: 0755 with_items: - - "{{ sickrage_config_directory }}" + - "{{ sickchill_config_directory }}" -- name: Sickrage Docker Container +- name: Sickchill Docker Container docker_container: - name: sickrage - image: linuxserver/sickrage + name: sickchill + image: linuxserver/sickchill pull: true volumes: - - "{{ sickrage_config_directory }}:/config:rw" - - "{{ sickrage_downloads_directory }}/completed:/downloads:rw" - - "{{ sickrage_tv_directory }}:/tv:rw" + - "{{ sickchill_config_directory }}:/config:rw" + - "{{ sickchill_downloads_directory }}/completed:/downloads:rw" + - "{{ sickchill_tv_directory }}:/tv:rw" ports: - "8081:8081" env: TZ: "{{ ansible_nas_timezone }}" - PUID: "{{ sickrage_user_id }}" - PGID: "{{ sickrage_group_id }}" + PUID: "{{ sickchill_user_id }}" + PGID: "{{ sickchill_group_id }}" restart_policy: unless-stopped memory: 1g labels: - traefik.backend: "sickrage" - traefik.frontend.rule: "Host:sickrage.{{ ansible_nas_domain }}" - traefik.enable: "{{ sickrage_available_externally }}" - traefik.port: "8081" \ No newline at end of file + traefik.backend: "sickchill" + traefik.frontend.rule: "Host:sickchill.{{ ansible_nas_domain }}" + traefik.enable: "{{ sickchill_available_externally }}" + traefik.port: "8081" diff --git a/templates/traefik/traefik.toml b/templates/traefik/traefik.toml index c73de642..c863ecc3 100644 --- a/templates/traefik/traefik.toml +++ b/templates/traefik/traefik.toml @@ -196,10 +196,10 @@ onDemand = false # create certificate when container is created "plex.{{ ansible_nas_domain }}", "portainer.{{ ansible_nas_domain }}", "radarr.{{ ansible_nas_domain }}", - "sickrage.{{ ansible_nas_domain }}", + "sickchill.{{ ansible_nas_domain }}", "sonarr.{{ ansible_nas_domain }}", "tautulli.{{ ansible_nas_domain }}", "thelounge.{{ ansible_nas_domain }}", "transmission.{{ ansible_nas_domain }}", "transmission-openvpn.{{ ansible_nas_domain }}", - "znc.{{ ansible_nas_domain }}"] \ No newline at end of file + "znc.{{ ansible_nas_domain }}"] From 899d611b25a6fdb530e15111ac7d136d30e968e6 Mon Sep 17 00:00:00 2001 From: Scott Cariss Date: Mon, 15 Apr 2019 16:39:31 +0100 Subject: [PATCH 2/4] Rename sickrage task to sickchill --- tasks/{sickrage.yml => sickchill.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tasks/{sickrage.yml => sickchill.yml} (100%) diff --git a/tasks/sickrage.yml b/tasks/sickchill.yml similarity index 100% rename from tasks/sickrage.yml rename to tasks/sickchill.yml From f8554f3be558dace1cebb6b043cf919c8892e612 Mon Sep 17 00:00:00 2001 From: Scott Cariss Date: Tue, 16 Apr 2019 10:02:40 +0100 Subject: [PATCH 3/4] Remove old sickrage container first but keep volumes to allow migration --- tasks/sickchill.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tasks/sickchill.yml b/tasks/sickchill.yml index ad3ee029..2a838092 100644 --- a/tasks/sickchill.yml +++ b/tasks/sickchill.yml @@ -1,4 +1,10 @@ --- +- name: Remove Old Sickrage Docker Container + docker_container: + name: sickrage + state: absent + keep_volumes: true + - name: Create Sickchill Directories file: path: "{{ item }}" From 84b0e964e721d801514d00355efb37871fa8b334 Mon Sep 17 00:00:00 2001 From: Scott Cariss Date: Tue, 16 Apr 2019 10:10:19 +0100 Subject: [PATCH 4/4] Allow sickchill downloads path to be fully managed by sickchill_downloads_directory variable --- group_vars/all.yml.dist | 2 +- tasks/sickchill.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/group_vars/all.yml.dist b/group_vars/all.yml.dist index 969cbe69..5fd8fbb5 100644 --- a/group_vars/all.yml.dist +++ b/group_vars/all.yml.dist @@ -348,7 +348,7 @@ couchpotato_group_id: 0 sickchill_available_externally: "false" sickchill_config_directory: "{{ docker_home }}/sickchill/config" sickchill_tv_directory: "{{ tv_root }}" -sickchill_downloads_directory: "{{ downloads_root }}" +sickchill_downloads_directory: "{{ downloads_root }}/completed" sickchill_user_id: 0 sickchill_group_id: 0 diff --git a/tasks/sickchill.yml b/tasks/sickchill.yml index 2a838092..aa862dfe 100644 --- a/tasks/sickchill.yml +++ b/tasks/sickchill.yml @@ -20,7 +20,7 @@ pull: true volumes: - "{{ sickchill_config_directory }}:/config:rw" - - "{{ sickchill_downloads_directory }}/completed:/downloads:rw" + - "{{ sickchill_downloads_directory }}:/downloads:rw" - "{{ sickchill_tv_directory }}:/tv:rw" ports: - "8081:8081"