From 19302d91e633426f38a1fc5edd69ed70eb34071f Mon Sep 17 00:00:00 2001 From: akanealw Date: Mon, 5 May 2025 20:18:56 -0500 Subject: [PATCH] separated vpn services to separate compose file --- mixed/compose.yml | 81 ----------------------------------------------- vpn/.env | 16 ++++++++++ vpn/compose.yml | 81 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 97 insertions(+), 81 deletions(-) create mode 100755 vpn/.env create mode 100644 vpn/compose.yml diff --git a/mixed/compose.yml b/mixed/compose.yml index 11a3edf..f16f0f0 100755 --- a/mixed/compose.yml +++ b/mixed/compose.yml @@ -49,31 +49,6 @@ services: - 9191:8191 restart: always - gluetun: - container_name: gluetun - image: qmcgaw/gluetun:v3.34 - environment: - - VPN_SERVICE_PROVIDER=mullvad - - VPN_TYPE=wireguard - - WIREGUARD_PRIVATE_KEY=MLS9MpXipZq7mmFB0wfb7Guj8LUea4OSs8guHVlVfW8= - - WIREGUARD_ADDRESSES=10.64.173.92/32 - - HTTPPROXY=on - - SERVER_COUNTRIES=USA - - TZ=${TZ} - cap_add: - - NET_ADMIN - devices: - - /dev/net/tun:/dev/net/tun - ports: - - 3129:3129/tcp # Jdownloader - - 5800:5800/tcp # Jdownloader - - 8888:8888/tcp # HTTP proxy - - 8181:8080/tcp # SABnzbd - - 8282:8282/tcp # qBittorrent - restart: always - volumes: - - ${DOCKER_CONFIGS}/gluetun:/gluetun - jackett: container_name: jackett image: lscr.io/linuxserver/jackett:latest @@ -90,29 +65,6 @@ services: - ${DOCKER_CONFIGS}/jackett/config:/config - ${MEDIA_DIR}/downloads/torrents:/torrents - jdownloader: - container_name: jdownloader - image: jlesage/jdownloader-2:latest - environment: - - PGID=${PGID} - - PUID=${PUID} - - UMASK=${UMASK} - - TZ=${TZ} - - KEEP_APP_RUNNING=1 - - CLEAN_TMP_DIR=1 - - XDG_DOWNLOAD_DIR=/output -# - MYJD_USER= -# - MYJD_PASSWORD= -# - MYJD_DEVICE_NAME=dockerserver - network_mode: "service:gluetun" - depends_on: - - gluetun - restart: always - volumes: - - ${DOCKER_CONFIGS}/jdownloader/config:/config - - ${MEDIA_DIR}/downloads/jdownloader:/output - - /etc/localtime:/etc/localtime:ro - jellyfin: container_name: jellyfin image: lscr.io/linuxserver/jellyfin:latest @@ -255,23 +207,6 @@ services: volumes: - ${DOCKER_CONFIGS}/prowlarr/config:/config - qbittorrent: - container_name: qbittorrent - image: lscr.io/linuxserver/qbittorrent:latest - environment: - - PUID=${PUID} - - PGID=${PGID} - - TZ=${TZ} - - WEBUI_PORT=8282 - network_mode: "service:gluetun" - depends_on: - - gluetun - restart: always - volumes: - - ${DOCKER_CONFIGS}/qbittorrent/config:/config - - ${MEDIA_DIR}/downloads:/downloads - - ${MEDIA_DIR}/downloads/torrents:/torrents - radarr: container_name: radarr image: lscr.io/linuxserver/radarr:latest @@ -293,22 +228,6 @@ services: - 8086:8080 restart: always - sabnzbd: - container_name: sabnzbd - image: lscr.io/linuxserver/sabnzbd:latest - environment: - - PUID=${PUID} - - PGID=${PGID} - - TZ=${TZ} - network_mode: "service:gluetun" - depends_on: - - gluetun - restart: always - volumes: - - ${DOCKER_CONFIGS}/sabnzbd/config:/config - - ${MEDIA_DIR}/downloads:/downloads - - ${MEDIA_DIR}/downloads/nzbs:/nzbs - sonarr: container_name: sonarr image: lscr.io/linuxserver/sonarr:latest diff --git a/vpn/.env b/vpn/.env new file mode 100755 index 0000000..71a992d --- /dev/null +++ b/vpn/.env @@ -0,0 +1,16 @@ +#GLOBAL SETTINGS +COMPOSE_HTTP_TIMEOUT=120 +COMPOSE_IGNORE_ORPHANS=1 +DOCKER_CONFIGS=. +DOCKERGID=999 +DOCKERHOSTNAME=DockerServer +DOCKERLOGGING_MAXFILE=10 +DOCKERLOGGING_MAXSIZE=200k +PGID=1000 +PUID=1000 +UMASK=000 +TZ=America/Chicago + +#DIRECTORY PATHS +MEDIA_DIR=/mnt/media +STORAGE_DIR=/mnt/storage diff --git a/vpn/compose.yml b/vpn/compose.yml new file mode 100644 index 0000000..5cef466 --- /dev/null +++ b/vpn/compose.yml @@ -0,0 +1,81 @@ +services: + gluetun: + container_name: gluetun + image: qmcgaw/gluetun:v3.34 + environment: + - VPN_SERVICE_PROVIDER=mullvad + - VPN_TYPE=wireguard + - WIREGUARD_PRIVATE_KEY=MLS9MpXipZq7mmFB0wfb7Guj8LUea4OSs8guHVlVfW8= + - WIREGUARD_ADDRESSES=10.64.173.92/32 + - HTTPPROXY=on + - SERVER_COUNTRIES=USA + - TZ=${TZ} + cap_add: + - NET_ADMIN + devices: + - /dev/net/tun:/dev/net/tun + ports: + - 3129:3129/tcp # Jdownloader + - 5800:5800/tcp # Jdownloader + - 8888:8888/tcp # HTTP proxy + - 8181:8080/tcp # SABnzbd + - 8282:8282/tcp # qBittorrent + restart: always + volumes: + - ${DOCKER_CONFIGS}/gluetun:/gluetun + + jdownloader: + container_name: jdownloader + image: jlesage/jdownloader-2:latest + environment: + - PGID=${PGID} + - PUID=${PUID} + - UMASK=${UMASK} + - TZ=${TZ} + - KEEP_APP_RUNNING=1 + - CLEAN_TMP_DIR=1 + - XDG_DOWNLOAD_DIR=/output +# - MYJD_USER= +# - MYJD_PASSWORD= +# - MYJD_DEVICE_NAME=dockerserver + network_mode: "service:gluetun" + depends_on: + - gluetun + restart: always + volumes: + - ${DOCKER_CONFIGS}/jdownloader/config:/config + - ${MEDIA_DIR}/downloads/jdownloader:/output + - /etc/localtime:/etc/localtime:ro + + qbittorrent: + container_name: qbittorrent + image: lscr.io/linuxserver/qbittorrent:latest + environment: + - PUID=${PUID} + - PGID=${PGID} + - TZ=${TZ} + - WEBUI_PORT=8282 + network_mode: "service:gluetun" + depends_on: + - gluetun + restart: always + volumes: + - ${DOCKER_CONFIGS}/qbittorrent/config:/config + - ${MEDIA_DIR}/downloads:/downloads + - ${MEDIA_DIR}/downloads/torrents:/torrents + + sabnzbd: + container_name: sabnzbd + image: lscr.io/linuxserver/sabnzbd:latest + environment: + - PUID=${PUID} + - PGID=${PGID} + - TZ=${TZ} + network_mode: "service:gluetun" + depends_on: + - gluetun + restart: always + volumes: + - ${DOCKER_CONFIGS}/sabnzbd/config:/config + - ${MEDIA_DIR}/downloads:/downloads + - ${MEDIA_DIR}/downloads/nzbs:/nzbs \ No newline at end of file