From 06d056a6619f7bf12e88fa5aae169d0d8a19bdac Mon Sep 17 00:00:00 2001 From: Jean Froment Date: Fri, 12 Feb 2021 11:44:47 +0100 Subject: [PATCH 01/12] Switch to lidarr develop (preview has been deprecated) --- README.md | 2 +- services/lidarr.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6c9039e..bc8b674 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ seedbox and personal media server. | Sonarr | sonarr.yourdomain.com | [linuxserver/sonarr](https://hub.docker.com/r/linuxserver/sonarr) | *preview* | TV Shows monitor | | Radarr | radarr.yourdomain.com | [linuxserver/radarr](https://hub.docker.com/r/linuxserver/radarr) | *develop* | Movies monitor | | Bazarr | bazarr.yourdomain.com | [linuxserver/bazarr](https://hub.docker.com/r/linuxserver/bazarr) | *latest* | Subtitles monitor | -| Lidarr | lidarr.yourdomain.com | [linuxserver/lidarr](https://hub.docker.com/r/linuxserver/lidarr) | *preview* | Music monitor | +| Lidarr | lidarr.yourdomain.com | [linuxserver/lidarr](https://hub.docker.com/r/linuxserver/lidarr) | *develop* | Music monitor | | Jackett | jackett.yourdomain.com | [linuxserver/jackett](https://hub.docker.com/r/linuxserver/jackett) | *latest* | Tracker indexer | | JDownloader | jdownloader.yourdomain.com | [jlesage/jdownloader-2](https://hub.docker.com/r/jlesage/jdownloader-2)| *latest* | Direct downloader | | Tautulli (plexPy) | tautulli.yourdomain.com | [linuxserver/tautulli](https://hub.docker.com/r/linuxserver/tautulli) | *latest* | Plex stats and admin| diff --git a/services/lidarr.yaml b/services/lidarr.yaml index dcd4612..d13b01f 100644 --- a/services/lidarr.yaml +++ b/services/lidarr.yaml @@ -1,6 +1,6 @@ services: lidarr: - image: ghcr.io/linuxserver/lidarr:preview + image: ghcr.io/linuxserver/lidarr:develop container_name: lidarr restart: always volumes: From 90ff2a6ba72b7171a76976156cade9b2fb281946 Mon Sep 17 00:00:00 2001 From: Jean Froment Date: Mon, 15 Feb 2021 14:57:53 +0100 Subject: [PATCH 02/12] Add tdarr v2 (wip) --- services.conf | 1 + services/tdarrv2.yaml | 52 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 services/tdarrv2.yaml diff --git a/services.conf b/services.conf index 6189d0e..0859b74 100644 --- a/services.conf +++ b/services.conf @@ -9,6 +9,7 @@ lidarr: enable tautulli: enable jdownloader: enable tdarr: enable +tdarrv2: enable nextcloud: enable portainer: enable netdata: enable diff --git a/services/tdarrv2.yaml b/services/tdarrv2.yaml new file mode 100644 index 0000000..6426f1f --- /dev/null +++ b/services/tdarrv2.yaml @@ -0,0 +1,52 @@ +services: + tdarr: + image: haveagitgat/tdarr:latest + container_name: tdarrv2 + restart: always + environment: + - PUID=${PUID} + - PGID=${PGID} + - TZ=${TZ} + - serverIP=tdarr + - serverPort=8266 + - webUIPort=8265 + - ROOT_URL=https://tdarrv2.${TRAEFIK_DOMAIN} + - BASE=/ + volumes: + - torrents:/media + - transcodes:/temp + - configtdarrv2:/app/server + labels: + - "traefik.enable=true" + - "traefik.http.services.tdarrv2-seedbox.loadbalancer.server.port=8265" + - "traefik.http.routers.tdarrv2.rule=Host(`tdarrv2.${TRAEFIK_DOMAIN}`)" + - "traefik.http.routers.tdarrv2.middlewares=common-auth@file" + + tdarr_node: + image: haveagitgat/tdarr_node:latest + container_name: tdarr_node + restart: always + environment: + - PUID=${PUID} + - PGID=${PGID} + - TZ=${TZ} + - nodeID=Node1 + - nodeIP=tdarr_node + - nodePort=8267 + - serverIP=tdarrv2 + - serverPort=8266 + volumes: + - torrents:/media + - transcodes:/temp + labels: + - "traefik.enable=false" + +volumes: + configtdarrv2: + driver: local-persist + driver_opts: + mountpoint: /data/config/tdarrv2 + transcodes: + driver: local-persist + driver_opts: + mountpoint: /data/config/tdarr-transcodes \ No newline at end of file From 017a6c54af3577f25da0ddc50cdae0d42879a3c5 Mon Sep 17 00:00:00 2001 From: Jean Froment Date: Mon, 15 Feb 2021 15:02:36 +0100 Subject: [PATCH 03/12] tdarr v2 --- services.conf | 2 +- services/tdarrv2.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services.conf b/services.conf index 0859b74..1c01be4 100644 --- a/services.conf +++ b/services.conf @@ -8,7 +8,7 @@ bazarr: enable lidarr: enable tautulli: enable jdownloader: enable -tdarr: enable +tdarr: disable tdarrv2: enable nextcloud: enable portainer: enable diff --git a/services/tdarrv2.yaml b/services/tdarrv2.yaml index 6426f1f..27d53c9 100644 --- a/services/tdarrv2.yaml +++ b/services/tdarrv2.yaml @@ -1,5 +1,5 @@ services: - tdarr: + tdarrv2: image: haveagitgat/tdarr:latest container_name: tdarrv2 restart: always @@ -7,7 +7,7 @@ services: - PUID=${PUID} - PGID=${PGID} - TZ=${TZ} - - serverIP=tdarr + - serverIP=tdarrv2 - serverPort=8266 - webUIPort=8265 - ROOT_URL=https://tdarrv2.${TRAEFIK_DOMAIN} From 08c52810acf3eeb747c174eb585d55218769924b Mon Sep 17 00:00:00 2001 From: Jean Froment Date: Mon, 15 Feb 2021 15:07:24 +0100 Subject: [PATCH 04/12] tdarr v2: rmeove useless params --- services/tdarrv2.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/services/tdarrv2.yaml b/services/tdarrv2.yaml index 27d53c9..d502d4a 100644 --- a/services/tdarrv2.yaml +++ b/services/tdarrv2.yaml @@ -10,8 +10,6 @@ services: - serverIP=tdarrv2 - serverPort=8266 - webUIPort=8265 - - ROOT_URL=https://tdarrv2.${TRAEFIK_DOMAIN} - - BASE=/ volumes: - torrents:/media - transcodes:/temp From 5ceb7d3a12de968afe30c03ccb2248c093832070 Mon Sep 17 00:00:00 2001 From: Jean Froment Date: Mon, 15 Feb 2021 15:10:33 +0100 Subject: [PATCH 05/12] Link tdarr v2 config to tdarr v1 --- services/tdarrv2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/tdarrv2.yaml b/services/tdarrv2.yaml index d502d4a..abafec7 100644 --- a/services/tdarrv2.yaml +++ b/services/tdarrv2.yaml @@ -43,7 +43,7 @@ volumes: configtdarrv2: driver: local-persist driver_opts: - mountpoint: /data/config/tdarrv2 + mountpoint: /data/config/tdarr transcodes: driver: local-persist driver_opts: From 75f0d66089791786bd3a7f9efeebb58c0d06f003 Mon Sep 17 00:00:00 2001 From: Jean Froment Date: Mon, 15 Feb 2021 15:15:15 +0100 Subject: [PATCH 06/12] Fix IP --- services.conf | 2 +- services/tdarrv2.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services.conf b/services.conf index 1c01be4..0859b74 100644 --- a/services.conf +++ b/services.conf @@ -8,7 +8,7 @@ bazarr: enable lidarr: enable tautulli: enable jdownloader: enable -tdarr: disable +tdarr: enable tdarrv2: enable nextcloud: enable portainer: enable diff --git a/services/tdarrv2.yaml b/services/tdarrv2.yaml index abafec7..a14842e 100644 --- a/services/tdarrv2.yaml +++ b/services/tdarrv2.yaml @@ -7,7 +7,7 @@ services: - PUID=${PUID} - PGID=${PGID} - TZ=${TZ} - - serverIP=tdarrv2 + - serverIP=0.0.0.0 - serverPort=8266 - webUIPort=8265 volumes: @@ -43,7 +43,7 @@ volumes: configtdarrv2: driver: local-persist driver_opts: - mountpoint: /data/config/tdarr + mountpoint: /data/config/tdarrv2 transcodes: driver: local-persist driver_opts: From cc2d2b65285644ac6f287a694af395ea0c4cefdb Mon Sep 17 00:00:00 2001 From: Jean Froment Date: Mon, 15 Feb 2021 15:29:30 +0100 Subject: [PATCH 07/12] Change tdarr v2 volumes locations --- services/tdarr.yaml | 3 +++ services/tdarrv2.yaml | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/services/tdarr.yaml b/services/tdarr.yaml index 231f21a..e4164b4 100644 --- a/services/tdarr.yaml +++ b/services/tdarr.yaml @@ -1,3 +1,6 @@ +################################################################################# +####################### DEPRECATED - WILL BE DELETED SOON ####################### +################################################################################# services: tdarr: image: haveagitgat/tdarr:1.3003 diff --git a/services/tdarrv2.yaml b/services/tdarrv2.yaml index a14842e..aa3ea9e 100644 --- a/services/tdarrv2.yaml +++ b/services/tdarrv2.yaml @@ -14,6 +14,7 @@ services: - torrents:/media - transcodes:/temp - configtdarrv2:/app/server + - settingstdarrv2:/app/configs labels: - "traefik.enable=true" - "traefik.http.services.tdarrv2-seedbox.loadbalancer.server.port=8265" @@ -43,8 +44,12 @@ volumes: configtdarrv2: driver: local-persist driver_opts: - mountpoint: /data/config/tdarrv2 + mountpoint: /data/config/tdarrv2/server + settingstdarrv2: + driver: local-persist + driver_opts: + mountpoint: /data/config/tdarrv2/configs transcodes: driver: local-persist driver_opts: - mountpoint: /data/config/tdarr-transcodes \ No newline at end of file + mountpoint: /data/config/tdarrv2/transcodes \ No newline at end of file From 86f6511701638e1a14c321341fcf60cdfd509084 Mon Sep 17 00:00:00 2001 From: Jean Froment Date: Mon, 15 Feb 2021 15:31:57 +0100 Subject: [PATCH 08/12] Add config volume to tdarr v2 node --- services/tdarrv2.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/services/tdarrv2.yaml b/services/tdarrv2.yaml index aa3ea9e..4ad27b9 100644 --- a/services/tdarrv2.yaml +++ b/services/tdarrv2.yaml @@ -37,6 +37,7 @@ services: volumes: - torrents:/media - transcodes:/temp + - settingstdarrv2:/app/configs labels: - "traefik.enable=false" From b5a21801a21ee9fb4bd03cfd059f6b9941aba0bf Mon Sep 17 00:00:00 2001 From: Jean Froment Date: Fri, 19 Feb 2021 10:27:57 +0100 Subject: [PATCH 09/12] Fixe #10 --- tools/init-setup-nextcloud.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/init-setup-nextcloud.sh b/tools/init-setup-nextcloud.sh index 2973cc4..66c4b50 100755 --- a/tools/init-setup-nextcloud.sh +++ b/tools/init-setup-nextcloud.sh @@ -8,8 +8,8 @@ docker exec -it -u abc -w /config/www/nextcloud \ nextcloud bash -c " \ php occ maintenance:install \ --database \"mysql\" \ - --database-host \"${MYSQL_DATABASE}\" \ - --database-name \"nextcloud-db\" \ + --database-host \"nextcloud-db\" \ + --database-name \"${MYSQL_DATABASE}\" \ --database-user \"${MYSQL_USER}\" \ --database-pass \"${MYSQL_PASSWORD}\" \ --admin-user \"${NEXTCLOUD_ADMIN_USER}\" \ From c239d12be464912513611c18bf36a918624489fc Mon Sep 17 00:00:00 2001 From: Jean Froment Date: Thu, 11 Mar 2021 09:38:42 +0100 Subject: [PATCH 10/12] Change sonarr tag to develop (preview was deprecated since v3 GA release) --- README.md | 2 +- services/sonarr.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bc8b674..a49a64c 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ seedbox and personal media server. -----------------------|----------------------------|------------------------------------------------------------------------|-------------------------|---------------------| | Plex | plex.yourdomain.com | [linuxserver/plex](https://hub.docker.com/r/linuxserver/plex) | *latest* | Media Streaming | | Deluge | deluge.yourdomain.com | [linuxserver/deluge](https://hub.docker.com/r/linuxserver/deluge) | *latest* | Torrents downloader | -| Sonarr | sonarr.yourdomain.com | [linuxserver/sonarr](https://hub.docker.com/r/linuxserver/sonarr) | *preview* | TV Shows monitor | +| Sonarr | sonarr.yourdomain.com | [linuxserver/sonarr](https://hub.docker.com/r/linuxserver/sonarr) | *develop* | TV Shows monitor | | Radarr | radarr.yourdomain.com | [linuxserver/radarr](https://hub.docker.com/r/linuxserver/radarr) | *develop* | Movies monitor | | Bazarr | bazarr.yourdomain.com | [linuxserver/bazarr](https://hub.docker.com/r/linuxserver/bazarr) | *latest* | Subtitles monitor | | Lidarr | lidarr.yourdomain.com | [linuxserver/lidarr](https://hub.docker.com/r/linuxserver/lidarr) | *develop* | Music monitor | diff --git a/services/sonarr.yaml b/services/sonarr.yaml index d29bfbe..6ce4d6f 100644 --- a/services/sonarr.yaml +++ b/services/sonarr.yaml @@ -1,6 +1,6 @@ services: sonarr: - image: ghcr.io/linuxserver/sonarr:preview + image: ghcr.io/linuxserver/sonarr:develop container_name: sonarr restart: always volumes: From e6fcaea9fa502cba5c407b92132b9fc742a685f8 Mon Sep 17 00:00:00 2001 From: Ramy Ferjani <32905536+ramyferjani@users.noreply.github.com> Date: Wed, 14 Apr 2021 00:10:28 +0200 Subject: [PATCH 11/12] Fix typos I think there are some typos in the .env.sample file --- .env.sample | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.env.sample b/.env.sample index 5eacaad..ebd6581 100644 --- a/.env.sample +++ b/.env.sample @@ -1,7 +1,7 @@ # General Traefik (reverse proxy) settings TRAEFIK_DOMAIN=mydomain.com ACME_MAIL=my-email@my-provider.com -PILOT_TOKEN=mytraefiktoken # Keep it empty is not needed +PILOT_TOKEN=mytraefiktoken # Keep it empty if not needed # General settings TZ="Europe/Paris" @@ -14,7 +14,7 @@ HTTP_PASSWORD='mypassword_encoded' # Keep these simple quotes! PGID=1000 PUID=1000 -# Database (for Owncloud) +# Database (for Nextcloud) MYSQL_ROOT_PASSWORD=h4ckMePleAse889912101 MYSQL_DATABASE=nextcloud MYSQL_USER=nextcloud @@ -25,4 +25,4 @@ NEXTCLOUD_ADMIN_USER=admin NEXTCLOUD_ADMIN_PASSWORD=h4ckMePleAse873214668 # Portainer -PORTAINER_ADMIN_PASSWORD=h4ckMePleAse \ No newline at end of file +PORTAINER_ADMIN_PASSWORD=h4ckMePleAse From e6656c00967cb92b9ae35e8c16bc04061ba95f32 Mon Sep 17 00:00:00 2001 From: Jean Froment Date: Wed, 28 Apr 2021 11:23:48 +0200 Subject: [PATCH 12/12] Delete tdarr v1, replace v2 by tdarr --- services.conf | 1 - services/tdarr.yaml | 53 +++++++++++++++++++++++++++++----------- services/tdarrv2.yaml | 56 ------------------------------------------- 3 files changed, 39 insertions(+), 71 deletions(-) delete mode 100644 services/tdarrv2.yaml diff --git a/services.conf b/services.conf index 0859b74..6189d0e 100644 --- a/services.conf +++ b/services.conf @@ -9,7 +9,6 @@ lidarr: enable tautulli: enable jdownloader: enable tdarr: enable -tdarrv2: enable nextcloud: enable portainer: enable netdata: enable diff --git a/services/tdarr.yaml b/services/tdarr.yaml index e4164b4..d5ddffc 100644 --- a/services/tdarr.yaml +++ b/services/tdarr.yaml @@ -1,31 +1,56 @@ -################################################################################# -####################### DEPRECATED - WILL BE DELETED SOON ####################### -################################################################################# services: tdarr: - image: haveagitgat/tdarr:1.3003 + image: haveagitgat/tdarr:latest container_name: tdarr restart: always environment: - PUID=${PUID} - PGID=${PGID} - TZ=${TZ} + - serverIP=0.0.0.0 + - serverPort=8266 + - webUIPort=8265 volumes: - - torrents:/home/Tdarr/Media - - configtdarr:/home/Tdarr/Documents/Tdarr - - tdarrdb:/var/lib/mongodb + - torrents:/media + - transcodes:/temp + - configtdarrv2:/app/server + - settingstdarrv2:/app/configs labels: - "traefik.enable=true" - - "traefik.http.services.tdarr-seedbox.loadbalancer.server.port=8265" - - "traefik.http.routers.tdarr.rule=Host(`tdarr.${TRAEFIK_DOMAIN}`)" - - "traefik.http.routers.tdarr.middlewares=common-auth@file" + - "traefik.http.services.tdarrv2-seedbox.loadbalancer.server.port=8265" + - "traefik.http.routers.tdarrv2.rule=Host(`tdarr.${TRAEFIK_DOMAIN}`)" + - "traefik.http.routers.tdarrv2.middlewares=common-auth@file" + + tdarr_node: + image: haveagitgat/tdarr_node:latest + container_name: tdarr_node + restart: always + environment: + - PUID=${PUID} + - PGID=${PGID} + - TZ=${TZ} + - nodeID=Node1 + - nodeIP=tdarr_node + - nodePort=8267 + - serverIP=tdarr + - serverPort=8266 + volumes: + - torrents:/media + - transcodes:/temp + - settingstdarrv2:/app/configs + labels: + - "traefik.enable=false" volumes: - configtdarr: + configtdarrv2: + driver: local-persist + driver_opts: + mountpoint: /data/config/tdarrv2/server + settingstdarrv2: driver: local-persist driver_opts: - mountpoint: /data/config/tdarr - tdarrdb: + mountpoint: /data/config/tdarrv2/configs + transcodes: driver: local-persist driver_opts: - mountpoint: /data/config/tdarr-db \ No newline at end of file + mountpoint: /data/config/tdarrv2/transcodes \ No newline at end of file diff --git a/services/tdarrv2.yaml b/services/tdarrv2.yaml deleted file mode 100644 index 4ad27b9..0000000 --- a/services/tdarrv2.yaml +++ /dev/null @@ -1,56 +0,0 @@ -services: - tdarrv2: - image: haveagitgat/tdarr:latest - container_name: tdarrv2 - restart: always - environment: - - PUID=${PUID} - - PGID=${PGID} - - TZ=${TZ} - - serverIP=0.0.0.0 - - serverPort=8266 - - webUIPort=8265 - volumes: - - torrents:/media - - transcodes:/temp - - configtdarrv2:/app/server - - settingstdarrv2:/app/configs - labels: - - "traefik.enable=true" - - "traefik.http.services.tdarrv2-seedbox.loadbalancer.server.port=8265" - - "traefik.http.routers.tdarrv2.rule=Host(`tdarrv2.${TRAEFIK_DOMAIN}`)" - - "traefik.http.routers.tdarrv2.middlewares=common-auth@file" - - tdarr_node: - image: haveagitgat/tdarr_node:latest - container_name: tdarr_node - restart: always - environment: - - PUID=${PUID} - - PGID=${PGID} - - TZ=${TZ} - - nodeID=Node1 - - nodeIP=tdarr_node - - nodePort=8267 - - serverIP=tdarrv2 - - serverPort=8266 - volumes: - - torrents:/media - - transcodes:/temp - - settingstdarrv2:/app/configs - labels: - - "traefik.enable=false" - -volumes: - configtdarrv2: - driver: local-persist - driver_opts: - mountpoint: /data/config/tdarrv2/server - settingstdarrv2: - driver: local-persist - driver_opts: - mountpoint: /data/config/tdarrv2/configs - transcodes: - driver: local-persist - driver_opts: - mountpoint: /data/config/tdarrv2/transcodes \ No newline at end of file