From 8b2f8b27c185478c185741732733992a728c95ba Mon Sep 17 00:00:00 2001
From: Colin Hebert <hebert.colin@gmail.com>
Date: Fri, 20 Jan 2023 18:06:44 +0100
Subject: [PATCH] Move tranmsission in the torrents service

---
 downloads.docker-compose.yml                  | 30 ----------
 indexer/docker-compose.yml                    |  3 +
 torrents/docker-compose.yml                   | 56 +++++++++++++++++++
 .../config => torrents/secrets}/.gitkeep      |  0
 torrents/volumes/transmission_config/.gitkeep |  0
 5 files changed, 59 insertions(+), 30 deletions(-)
 create mode 100644 torrents/docker-compose.yml
 rename {docker/volumes/transmission/config => torrents/secrets}/.gitkeep (100%)
 create mode 100644 torrents/volumes/transmission_config/.gitkeep

diff --git a/downloads.docker-compose.yml b/downloads.docker-compose.yml
index 12a9d3f..6208e69 100644
--- a/downloads.docker-compose.yml
+++ b/downloads.docker-compose.yml
@@ -1,36 +1,6 @@
 name: Downloads
 
 services:
-  transmission:
-    image: haugene/transmission-openvpn
-    environment:
-      PUID: ${NASCOMPOSE_UID?}
-      PGID: ${NASCOMPOSE_GID?}
-      OPENVPN_PROVIDER: PIA
-      OPENVPN_CONFIG: ${NASCOMPOSE_TRANSMISSION_VPNREGION?}
-      OPENVPN_OPTS: --inactive 3600 --ping 10 --ping-exit 60
-      LOCAL_NETWORK: 192.168.0.0/16
-    cap_add:
-      - NET_ADMIN
-    networks:
-      - traefik
-      - downloads
-    dns:
-      # Work around DNS blocks in various regions
-      - 1.1.1.1
-      - 1.0.0.1
-    volumes:
-      - transmission_config:/config/
-      - torrents:/data/
-    secrets:
-      - source: transmission_vpn_creds
-        target: openvpn_creds
-    restart: unless-stopped
-    labels:
-      traefik.enable: true
-      traefik.http.services.transmission.loadbalancer.server.port: 9091
-      traefik.http.routers.transmission.middlewares: authelia@file
-
   youtube-dl:
     image: alexta69/metube
     environment:
diff --git a/indexer/docker-compose.yml b/indexer/docker-compose.yml
index e923a7f..2723cdd 100644
--- a/indexer/docker-compose.yml
+++ b/indexer/docker-compose.yml
@@ -10,6 +10,7 @@ services:
       - default
       - traefik
       - indexer
+      - torrents
     dns:
       # Work around DNS blocks in various regions
       - 1.1.1.1
@@ -31,6 +32,8 @@ networks:
 
   traefik:
     external: true
+  torrents:
+    external: true
 
 volumes:
   prowlarr_config:
diff --git a/torrents/docker-compose.yml b/torrents/docker-compose.yml
new file mode 100644
index 0000000..5b4d185
--- /dev/null
+++ b/torrents/docker-compose.yml
@@ -0,0 +1,56 @@
+name: Torrents
+
+services:
+  transmission:
+    image: haugene/transmission-openvpn
+    environment:
+      PUID: ${NASCOMPOSE_UID?}
+      PGID: ${NASCOMPOSE_GID?}
+      OPENVPN_PROVIDER: PIA
+      OPENVPN_CONFIG: ${NASCOMPOSE_TRANSMISSION_VPNREGION?}
+      OPENVPN_OPTS: --inactive 3600 --ping 10 --ping-exit 60
+      LOCAL_NETWORK: 192.168.0.0/16
+    cap_add:
+      - NET_ADMIN
+    networks:
+      - traefik
+      - downloads
+    dns:
+      # Work around DNS blocks in various regions
+      - 1.1.1.1
+      - 1.0.0.1
+    volumes:
+      - transmission_config:/config/
+      - torrents:/data/
+    secrets:
+      - source: transmission_vpn_creds
+        target: openvpn_creds
+    restart: unless-stopped
+    labels:
+      traefik.enable: true
+      traefik.http.services.transmission.loadbalancer.server.port: 9091
+      traefik.http.routers.transmission.middlewares: authelia@file
+
+networks:
+  torrents:
+    name: torrents
+
+  traefik:
+    external: true
+
+volumes:
+  torrents:
+    driver_opts:
+      type: none
+      o: bind
+      device: ${NASCOMPOSE_DATA?}/torrents/
+
+  transmission_config:
+    driver_opts:
+      type: none
+      o: bind
+      device: ${NASCOMPOSE_SERVICES?}/volumes/transmission/config/
+
+secrets:
+    transmission_vpn_creds:
+        file: ${NASCOMPOSE_SERVICES?}/secrets/transmission/vpn_creds
diff --git a/docker/volumes/transmission/config/.gitkeep b/torrents/secrets/.gitkeep
similarity index 100%
rename from docker/volumes/transmission/config/.gitkeep
rename to torrents/secrets/.gitkeep
diff --git a/torrents/volumes/transmission_config/.gitkeep b/torrents/volumes/transmission_config/.gitkeep
new file mode 100644
index 0000000..e69de29