From e6656c00967cb92b9ae35e8c16bc04061ba95f32 Mon Sep 17 00:00:00 2001
From: Jean Froment <jean.froment@apalia.net>
Date: Wed, 28 Apr 2021 11:23:48 +0200
Subject: [PATCH] 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/tdarr
-  tdarrdb:
+      mountpoint: /data/config/tdarrv2/server
+  settingstdarrv2:
     driver: local-persist
     driver_opts:
-      mountpoint: /data/config/tdarr-db
\ No newline at end of file
+      mountpoint: /data/config/tdarrv2/configs
+  transcodes:
+    driver: local-persist
+    driver_opts:
+      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