80 Move torrent stack services

veerendra2 · Aug 29, 2023 · baf2e54 · baf2e54
1 parent 1eacded
commit baf2e54
Show file tree

Hide file tree

Showing 21 changed files with 21 additions and 50 deletions.
diff --git a/services/torrent/jackett/.env_jackett → services/jacket/.env_jackett b/services/torrent/jackett/.env_jackett → services/jacket/.env_jackett
diff --git a/services/torrent/jackett/ServerConfig.json → services/jacket/config/ServerConfig.json b/services/torrent/jackett/ServerConfig.json → services/jacket/config/ServerConfig.json
diff --git a/services/torrent/docker-stack-jackett.yml → services/jacket/docker-stack.yml b/services/torrent/docker-stack-jackett.yml → services/jacket/docker-stack.yml
@@ -1,19 +1,10 @@
 ---
-# https://dust6765.gitbook.io/raspberrypi-home-server/services/torrent-stack
-version: "3.8"
+version: 3.8
 
 networks:
   network_private:
     external: true
 
-volumes:
-  jackett:
-    driver: local
-    driver_opts:
-       o: bind
-       type: none
-       device: /media/disk2/volumes/jackett
-
 services:
   jackett:
     image: linuxserver/jackett:arm64v8-0.21.568
@@ -33,12 +24,11 @@ services:
         - traefik.http.services.jackett.loadbalancer.server.port=9117
     hostname: jackett
     env_file:
-      - ./jackett/.env_jackett
-      - .vpn_ip
+      - .env_jackett
     networks:
       - network_private
     volumes:
-      - jackett:/config
-      - ./jackett/ServerConfig.json:/config/Jackett/ServerConfig.json
-      - ./ip-test.sh:/opt/ip-test.sh
+      - ./config/ServerConfig.json:/config/Jackett/ServerConfig.json
+      # Change below
+      - /media/disk2/volumes/jackett:/config
       - /media/disk2/downloads/torrents:/opt/torrents
diff --git a/services/qbittorrent/.vpn_ip b/services/qbittorrent/.vpn_ip
@@ -0,0 +1 @@
+VPN_IP=144.24.143.4
diff --git a/services/torrent/README.md → services/qbittorrent/README.md b/services/torrent/README.md → services/qbittorrent/README.md
diff --git a/...ices/torrent/docker-stack-qbittorrent.yml → services/qbittorrent/docker-stack.yml b/...ices/torrent/docker-stack-qbittorrent.yml → services/qbittorrent/docker-stack.yml
@@ -1,5 +1,4 @@
 ---
-# https://dust6765.gitbook.io/raspberrypi-home-server/services/torrent-stack
 version: "3.8"
 
 networks:

diff --git a/services/torrent/ip-test.sh → services/qbittorrent/ip-test.sh b/services/torrent/ip-test.sh → services/qbittorrent/ip-test.sh
diff --git a/...ices/torrent/qbittorrent/.env_qbittorrent → .../qbittorrent/qbittorrent/.env_qbittorrent b/...ices/torrent/qbittorrent/.env_qbittorrent → .../qbittorrent/qbittorrent/.env_qbittorrent
diff --git a/...ices/torrent/qbittorrent/qBittorrent.conf → .../qbittorrent/qbittorrent/qBittorrent.conf b/...ices/torrent/qbittorrent/qBittorrent.conf → .../qbittorrent/qbittorrent/qBittorrent.conf
diff --git a/services/torrent/wireguard/.env_wireguard → ...ices/qbittorrent/wireguard/.env_wireguard b/services/torrent/wireguard/.env_wireguard → ...ices/qbittorrent/wireguard/.env_wireguard
diff --git a/...orrent/wireguard/dante-server/danted.conf → ...orrent/wireguard/dante-server/danted.conf b/...orrent/wireguard/dante-server/danted.conf → ...orrent/wireguard/dante-server/danted.conf
diff --git a/...torrent/wireguard/dante-server/install.sh → ...torrent/wireguard/dante-server/install.sh b/...torrent/wireguard/dante-server/install.sh → ...torrent/wireguard/dante-server/install.sh
diff --git a/...ces/torrent/wireguard/dante-server/run.sh → ...qbittorrent/wireguard/dante-server/run.sh b/...ces/torrent/wireguard/dante-server/run.sh → ...qbittorrent/wireguard/dante-server/run.sh
diff --git a/services/torrent/radarr/.env_radarr → services/radarr/.env_radarr b/services/torrent/radarr/.env_radarr → services/radarr/.env_radarr
diff --git a/services/torrent/radarr/config.xml → services/radarr/config/config.xml b/services/torrent/radarr/config.xml → services/radarr/config/config.xml
diff --git a/services/torrent/docker-stack-radarr.yml → services/radarr/docker-stack.yml b/services/torrent/docker-stack-radarr.yml → services/radarr/docker-stack.yml
@@ -1,19 +1,10 @@
 ---
-# https://dust6765.gitbook.io/raspberrypi-home-server/services/torrent-stack
-version: "3.8"
+version: 3.8
 
 networks:
   network_private:
     external: true
 
-volumes:
-  radarr:
-    driver: local
-      driver_opts:
-        o: bind
-        type: none
-        device: /media/disk2/volumes/radarr
-
 services:
   radarr:
     image: linuxserver/radarr:arm64v8-4.6.4
@@ -33,17 +24,11 @@ services:
         - traefik.http.services.radarr.loadbalancer.server.port=7878
     hostname: radarr
     env_file:
-      - ./radarr/.env_radarr
-      - .vpn_ip
+      - .env_radarr
     networks:
       - network_private
     volumes:
-      - radarr:/config
-      - ./radarr/config.xml:/config/config.xml
-      - ./ip-test.sh:/opt/ip-test.sh
+      - ./config/config.xml:/config/config.xml
+      # Change below
+      - /media/disk2/volumes/radarr:/config
       - /media/disk2/downloads:/downloads
-    # healthcheck:
-    #   test: ["CMD", "/opt/ip-test.sh"]
-    #   interval: 2m
-    #   timeout: 10s
-    #   retries: 3
diff --git a/services/torrent/sonarr/.env_sonarr → services/sonarr/.env_sonarr b/services/torrent/sonarr/.env_sonarr → services/sonarr/.env_sonarr
diff --git a/services/torrent/sonarr/config.xml → services/sonarr/config/config.xml b/services/torrent/sonarr/config.xml → services/sonarr/config/config.xml
diff --git a/services/torrent/docker-stack-sonarr.yml → services/sonarr/docker-stack.yml b/services/torrent/docker-stack-sonarr.yml → services/sonarr/docker-stack.yml
@@ -1,6 +1,5 @@
 ---
-# https://dust6765.gitbook.io/raspberrypi-home-server/services/torrent-stack
-version: "3.8"
+version: 3.8
 
 networks:
   network_private:
@@ -33,17 +32,11 @@ services:
         - traefik.http.services.sonarr.loadbalancer.server.port=8989
     hostname: sonarr
     env_file:
-      - ./sonarr/.env_sonarr
-      - .vpn_ip
+      - .env_sonarr
     networks:
       - network_private
     volumes:
-      - sonarr:/config
       - ./sonarr/config.xml:/config/config.xml
-      - ./ip-test.sh:/opt/ip-test.sh
+      # Change below
+      - /media/disk2/volumes/sonarr:/config
       - /media/disk2/downloads:/downloads
-    # healthcheck:
-    #   test: ["CMD", "/opt/ip-test.sh"]
-    #   interval: 2m
-    #   timeout: 10s
-    #   retries: 3
diff --git a/tasks/deploy-services.yml b/tasks/deploy-services.yml
@@ -34,7 +34,6 @@
     name: traefik
     compose:
       - "{{ [services_base_dir_location, 'traefik', 'network.yml'] | path_join }}"
-  when: "'traefik' in services"
 
 - name: Deploy service stacks
   community.docker.docker_stack:

diff --git a/vars.yml b/vars.yml
@@ -9,8 +9,12 @@ services:
   - nextcloud
   # - pihole
   - portainer
-  - traefik
-  - torrent
+  - qbittorrent
+  - radarr
+  - sonarr
+  - rest-server
+  - vaultwarden
+  - searxng
 
 # Service's docker stack files copies in this location. It should end with slash
 services_base_dir_location: /opt/services/