diff --git a/roles/daily-backup/templates/fullBackup.sh b/roles/daily-backup/templates/fullBackup.sh index e6d2003..e7057eb 100755 --- a/roles/daily-backup/templates/fullBackup.sh +++ b/roles/daily-backup/templates/fullBackup.sh @@ -31,7 +31,7 @@ borg create -v --stats --compression lz4 \ /home \ /data \ /etc \ - /var/lib/deluge \ + /var/lib/transmission \ /var/lib/mailu \ /var/lib/matrix/media_store \ /var/lib/nextcloud \ diff --git a/roles/monit/templates/monitrc b/roles/monit/templates/monitrc index 96fa4cb..1c85e70 100755 --- a/roles/monit/templates/monitrc +++ b/roles/monit/templates/monitrc @@ -344,8 +344,13 @@ check host mail-admin with address mailu.banditlair.com #check host sonar with address sonar.banditlair.com # if failed port 443 protocol https with timeout 20 seconds then alert -check host deluge-ui with address deluge.banditlair.com - if failed port 443 protocol https with timeout 20 seconds then alert +check host transmission with address transmission.banditlair.com + if failed + port 443 + protocol https + status = 401 + with timeout 20 seconds + then alert check host rpg-wiki with address rpg.banditlair.com if failed port 443 protocol https with timeout 20 seconds then alert diff --git a/roles/scripts/templates/syncData.sh b/roles/scripts/templates/syncData.sh index a962c47..8e107bf 100644 --- a/roles/scripts/templates/syncData.sh +++ b/roles/scripts/templates/syncData.sh @@ -13,7 +13,7 @@ rsync -aAvh --progress root@${SOURCE_HOST}:/backups/ /backups --delete #Sync Torrents mkdir -p {{docker_compose_files_folder}}/torrent rsync -aAvh --progress root@${SOURCE_HOST}:{{docker_compose_files_folder_previous_server}}/torrent/config/ {{docker_compose_files_folder}}/torrent/config --delete -rsync -aAvh --progress root@${SOURCE_HOST}:/var/lib/deluge/ /var/lib/deluge --delete +rsync -aAvh --progress root@${SOURCE_HOST}:/var/lib/transmission/ /var/lib/transmission --delete #Sync emby mkdir -p {{docker_compose_files_folder}}/emby diff --git a/roles/torrent-docker/files/torrent/docker-compose.yml b/roles/torrent-docker/files/torrent/docker-compose.yml index 9a1a708..5e564f7 100644 --- a/roles/torrent-docker/files/torrent/docker-compose.yml +++ b/roles/torrent-docker/files/torrent/docker-compose.yml @@ -6,42 +6,6 @@ networks: name: web services: - deluge: - image: binhex/arch-delugevpn - cap_add: - - NET_ADMIN - ports: - - 8118:8118 - - 58846:58846 - volumes: - - /var/lib/deluge:/data - - ./config/deluge:/config - - /data:/media - - /etc/localtime:/etc/localtime:ro - environment: - - VPN_ENABLED=yes - - VPN_USER=${VPN_USER} - - VPN_PASS=${VPN_PASS} - - VPN_REMOTE=${VPN_REMOTE} - - VPN_PORT=${VPN_PORT} - - VPN_PROTOCOL=${VPN_PROTOCOL} - - VPN_PROV=${VPN_PROV} - - ENABLE_PRIVOXY=yes - - LAN_NETWORK=10.90.86.0/26 - - DEBUG=false - - PUID=33 - - PGID=33 - labels: - - "traefik.backend=deluge" - - "traefik.docker.network=web" - - "traefik.frontend.rule=Host:deluge.banditlair.com" - - "traefik.enable=true" - - "traefik.port=8112" - - "traefik.default.protocol=http" - restart: always - networks: - - web - transmission: image: haugene/transmission-openvpn:latest-alpine cap_add: @@ -95,7 +59,7 @@ services: - "traefik.port=8989" - "traefik.default.protocol=http" volumes: - - /var/lib/deluge/completed:/downloads + - /var/lib/transmission/completed:/downloads - /var/lib/nzbget/downloads:/nzbget - ./config/sonarr:/config - /data/TV:/tv @@ -119,7 +83,7 @@ services: - "traefik.port=7878" - "traefik.default.protocol=http" volumes: - - /var/lib/deluge/completed:/downloads + - /var/lib/transmission/completed:/downloads - /var/lib/nzbget/downloads:/nzbget - ./config/radarr:/config - /data/Movies:/movies @@ -143,7 +107,7 @@ services: - "traefik.port=8181" - "traefik.default.protocol=http" volumes: - - /var/lib/deluge/completed:/downloads + - /var/lib/transmission/completed:/downloads - ./config/headphones:/config - /data/Music:/music - /etc/localtime:/etc/localtime:ro @@ -188,7 +152,6 @@ services: - "traefik.port=9117" - "traefik.default.protocol=http" volumes: -# - /var/lib/deluge/completed:/downloads - ./config/jackett:/config - /etc/localtime:/etc/localtime:ro restart: always diff --git a/roles/torrent-docker/templates/torrent/.env b/roles/torrent-docker/templates/torrent/.env index 8c89d1f..8092b62 100644 --- a/roles/torrent-docker/templates/torrent/.env +++ b/roles/torrent-docker/templates/torrent/.env @@ -1,9 +1,6 @@ COMPOSE_PROJECT_NAME=torrent -#Domains -DELUGE_DOMAIN=deluge.banditlair.com - -#Deluge VPN +#VPN VPN_USER={{deluge_vpn_user}} VPN_PASS={{deluge_vpn_password}} VPN_REMOTE=vpn.blackvpn.de