From 6bb659d49287f2e121038073fded92b9eb188460 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sun, 28 Apr 2024 16:33:40 -0500 Subject: [PATCH] fix: :package: un-deprecate vpn containers Signed-off-by: Eric Nemchik --- compose/.apps/delugevpn/delugevpn.aarch64.yml | 3 +++ compose/.apps/delugevpn/delugevpn.labels.yml | 16 +++++++++++---- compose/.apps/delugevpn/delugevpn.ports.yml | 3 --- compose/.apps/delugevpn/delugevpn.yml | 20 +++++++++---------- compose/.apps/nzbget/nzbget.aarch64.yml | 2 +- compose/.apps/nzbget/nzbget.labels.yml | 4 ++-- compose/.apps/nzbget/nzbget.x86_64.yml | 2 +- compose/.apps/nzbgetvpn/nzbgetvpn.labels.yml | 14 +++++++++++-- compose/.apps/nzbgetvpn/nzbgetvpn.yml | 20 +++++++++---------- .../qbittorrentvpn/qbittorrentvpn.aarch64.yml | 3 +++ .../qbittorrentvpn/qbittorrentvpn.labels.yml | 15 +++++++++++--- .../qbittorrentvpn/qbittorrentvpn.ports.yml | 2 -- .../.apps/qbittorrentvpn/qbittorrentvpn.yml | 20 +++++++++---------- .../.apps/rtorrentvpn/rtorrentvpn.labels.yml | 2 +- .../.apps/sabnzbdvpn/sabnzbdvpn.labels.yml | 14 +++++++++++-- compose/.apps/sabnzbdvpn/sabnzbdvpn.yml | 20 +++++++++---------- .../transmissionvpn.labels.yml | 11 ++++++---- .../transmissionvpn/transmissionvpn.ports.yml | 4 ---- .../.apps/transmissionvpn/transmissionvpn.yml | 19 +++++------------- docs/apps/delugevpn.md | 4 ---- docs/apps/nzbget.md | 4 ---- docs/apps/nzbgetvpn.md | 4 ---- docs/apps/sabnzbdvpn.md | 4 ---- docs/apps/transmissionvpn.md | 4 ---- 24 files changed, 111 insertions(+), 103 deletions(-) create mode 100644 compose/.apps/delugevpn/delugevpn.aarch64.yml create mode 100644 compose/.apps/qbittorrentvpn/qbittorrentvpn.aarch64.yml diff --git a/compose/.apps/delugevpn/delugevpn.aarch64.yml b/compose/.apps/delugevpn/delugevpn.aarch64.yml new file mode 100644 index 0000000000..5c20a381dc --- /dev/null +++ b/compose/.apps/delugevpn/delugevpn.aarch64.yml @@ -0,0 +1,3 @@ +services: + delugevpn: + image: ghcr.io/binhex/arch-delugevpn:${DELUGEVPN_TAG} diff --git a/compose/.apps/delugevpn/delugevpn.labels.yml b/compose/.apps/delugevpn/delugevpn.labels.yml index 539964ffed..e62d7049a6 100644 --- a/compose/.apps/delugevpn/delugevpn.labels.yml +++ b/compose/.apps/delugevpn/delugevpn.labels.yml @@ -1,16 +1,24 @@ services: delugevpn: labels: - com.dockstarter.appinfo.deprecated: "true" - com.dockstarter.appinfo.description: "(DEPRECATED) Use Deluge with PrivoxyVPN" + com.dockstarter.appinfo.deprecated: "false" + com.dockstarter.appinfo.description: "Deluge with PrivoxyVPN" com.dockstarter.appinfo.nicename: "DelugeVPN" com.dockstarter.appvars.delugevpn_enabled: "false" com.dockstarter.appvars.delugevpn_environment_enable_privoxy: "no" + com.dockstarter.appvars.delugevpn_environment_lan_network: "192.168.x.x/24" + com.dockstarter.appvars.delugevpn_environment_name_servers: "1.1.1.1,8.8.8.8" + com.dockstarter.appvars.delugevpn_environment_vpn_client: "openvpn" + com.dockstarter.appvars.delugevpn_environment_vpn_enable: "no" + com.dockstarter.appvars.delugevpn_environment_vpn_input_ports: "" + com.dockstarter.appvars.delugevpn_environment_vpn_options: "" + com.dockstarter.appvars.delugevpn_environment_vpn_output_ports: "" + com.dockstarter.appvars.delugevpn_environment_vpn_pass: "your-vpn-pass" + com.dockstarter.appvars.delugevpn_environment_vpn_prov: "custom" + com.dockstarter.appvars.delugevpn_environment_vpn_user: "your-vpn-user" com.dockstarter.appvars.delugevpn_network_mode: "" - com.dockstarter.appvars.delugevpn_port_51413: "51413" com.dockstarter.appvars.delugevpn_port_58846: "58846" com.dockstarter.appvars.delugevpn_port_58946: "58946" - com.dockstarter.appvars.delugevpn_port_6881: "6881" com.dockstarter.appvars.delugevpn_port_8112: "8112" com.dockstarter.appvars.delugevpn_port_8118: "8118" com.dockstarter.appvars.delugevpn_restart: "unless-stopped" diff --git a/compose/.apps/delugevpn/delugevpn.ports.yml b/compose/.apps/delugevpn/delugevpn.ports.yml index 5e734412f0..a9c99e3214 100644 --- a/compose/.apps/delugevpn/delugevpn.ports.yml +++ b/compose/.apps/delugevpn/delugevpn.ports.yml @@ -1,11 +1,8 @@ services: delugevpn: ports: - - ${DELUGEVPN_PORT_51413}:51413 - - ${DELUGEVPN_PORT_51413}:51413/udp - ${DELUGEVPN_PORT_58846}:58846 - ${DELUGEVPN_PORT_58946}:58946 - ${DELUGEVPN_PORT_6881}:6881 - - ${DELUGEVPN_PORT_6881}:6881/udp - ${DELUGEVPN_PORT_8112}:8112 - ${DELUGEVPN_PORT_8118}:8118 diff --git a/compose/.apps/delugevpn/delugevpn.yml b/compose/.apps/delugevpn/delugevpn.yml index 1cd04f63ee..7e2625dd9e 100644 --- a/compose/.apps/delugevpn/delugevpn.yml +++ b/compose/.apps/delugevpn/delugevpn.yml @@ -6,17 +6,19 @@ services: container_name: delugevpn environment: - ENABLE_PRIVOXY=${DELUGEVPN_ENVIRONMENT_ENABLE_PRIVOXY} - - LAN_NETWORK=${LAN_NETWORK} - - NAME_SERVERS=${NS1},${NS2} + - LAN_NETWORK=${DELUGEVPN_ENVIRONMENT_LAN_NETWORK} + - NAME_SERVERS=${DELUGEVPN_ENVIRONMENT_NAME_SERVERS} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - - VPN_CLIENT=${VPN_CLIENT} - - VPN_ENABLED=${VPN_ENABLE} - - VPN_OPTIONS=${VPN_OPTIONS} - - VPN_PASS=${VPN_PASS} - - VPN_PROV=${VPN_PROV} - - VPN_USER=${VPN_USER} + - VPN_CLIENT=${DELUGEVPN_ENVIRONMENT_VPN_CLIENT} + - VPN_ENABLED=${DELUGEVPN_ENVIRONMENT_VPN_ENABLE} + - VPN_INPUT_PORTS=${DELUGEVPN_ENVIRONMENT_VPN_INPUT_PORTS} + - VPN_OPTIONS=${DELUGEVPN_ENVIRONMENT_VPN_OPTIONS} + - VPN_OUTPUT_PORTS=${DELUGEVPN_ENVIRONMENT_VPN_OUTPUT_PORTS} + - VPN_PASS=${DELUGEVPN_ENVIRONMENT_VPN_PASS} + - VPN_PROV=${DELUGEVPN_ENVIRONMENT_VPN_PROV} + - VPN_USER=${DELUGEVPN_ENVIRONMENT_VPN_USER} privileged: true restart: ${DELUGEVPN_RESTART} sysctls: @@ -25,5 +27,3 @@ services: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_CONFIG}/delugevpn:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${VPN_VOLUME_OVPNDIR}:/config/openvpn - - ${VPN_VOLUME_WGDIR}:/config/wireguard diff --git a/compose/.apps/nzbget/nzbget.aarch64.yml b/compose/.apps/nzbget/nzbget.aarch64.yml index 12b0b65976..02a46b4def 100644 --- a/compose/.apps/nzbget/nzbget.aarch64.yml +++ b/compose/.apps/nzbget/nzbget.aarch64.yml @@ -1,3 +1,3 @@ services: nzbget: - image: lscr.io/linuxserver/nzbget:${NZBGET_TAG} + image: ghcr.io/nzbgetcom/nzbget:${NZBGET_TAG} diff --git a/compose/.apps/nzbget/nzbget.labels.yml b/compose/.apps/nzbget/nzbget.labels.yml index 20a99f7cac..c41eb5f58b 100644 --- a/compose/.apps/nzbget/nzbget.labels.yml +++ b/compose/.apps/nzbget/nzbget.labels.yml @@ -1,8 +1,8 @@ services: nzbget: labels: - com.dockstarter.appinfo.deprecated: "true" - com.dockstarter.appinfo.description: "(DEPRECATED) Use SABnzbd" + com.dockstarter.appinfo.deprecated: "false" + com.dockstarter.appinfo.description: "Efficient usenet downloader" com.dockstarter.appinfo.nicename: "NZBGet" com.dockstarter.appvars.nzbget_enabled: "false" com.dockstarter.appvars.nzbget_network_mode: "" diff --git a/compose/.apps/nzbget/nzbget.x86_64.yml b/compose/.apps/nzbget/nzbget.x86_64.yml index 12b0b65976..02a46b4def 100644 --- a/compose/.apps/nzbget/nzbget.x86_64.yml +++ b/compose/.apps/nzbget/nzbget.x86_64.yml @@ -1,3 +1,3 @@ services: nzbget: - image: lscr.io/linuxserver/nzbget:${NZBGET_TAG} + image: ghcr.io/nzbgetcom/nzbget:${NZBGET_TAG} diff --git a/compose/.apps/nzbgetvpn/nzbgetvpn.labels.yml b/compose/.apps/nzbgetvpn/nzbgetvpn.labels.yml index 1c9c16310b..75a1af2e3b 100644 --- a/compose/.apps/nzbgetvpn/nzbgetvpn.labels.yml +++ b/compose/.apps/nzbgetvpn/nzbgetvpn.labels.yml @@ -1,11 +1,21 @@ services: nzbgetvpn: labels: - com.dockstarter.appinfo.deprecated: "true" - com.dockstarter.appinfo.description: "(DEPRECATED) Use SABnzbd with PrivoxyVPN" + com.dockstarter.appinfo.deprecated: "false" + com.dockstarter.appinfo.description: "NZBGet with PrivoxyVPN" com.dockstarter.appinfo.nicename: "NZBGetVPN" com.dockstarter.appvars.nzbgetvpn_enabled: "false" com.dockstarter.appvars.nzbgetvpn_environment_enable_privoxy: "no" + com.dockstarter.appvars.nzbgetvpn_environment_lan_network: "192.168.x.x/24" + com.dockstarter.appvars.nzbgetvpn_environment_name_servers: "1.1.1.1,8.8.8.8" + com.dockstarter.appvars.nzbgetvpn_environment_vpn_client: "openvpn" + com.dockstarter.appvars.nzbgetvpn_environment_vpn_enable: "no" + com.dockstarter.appvars.nzbgetvpn_environment_vpn_input_ports: "" + com.dockstarter.appvars.nzbgetvpn_environment_vpn_options: "" + com.dockstarter.appvars.nzbgetvpn_environment_vpn_output_ports: "" + com.dockstarter.appvars.nzbgetvpn_environment_vpn_pass: "your-vpn-pass" + com.dockstarter.appvars.nzbgetvpn_environment_vpn_prov: "custom" + com.dockstarter.appvars.nzbgetvpn_environment_vpn_user: "your-vpn-user" com.dockstarter.appvars.nzbgetvpn_network_mode: "" com.dockstarter.appvars.nzbgetvpn_port_6789: "6789" com.dockstarter.appvars.nzbgetvpn_port_8118: "8118" diff --git a/compose/.apps/nzbgetvpn/nzbgetvpn.yml b/compose/.apps/nzbgetvpn/nzbgetvpn.yml index 34aa48d0a5..0af7f05f92 100644 --- a/compose/.apps/nzbgetvpn/nzbgetvpn.yml +++ b/compose/.apps/nzbgetvpn/nzbgetvpn.yml @@ -6,17 +6,19 @@ services: container_name: nzbgetvpn environment: - ENABLE_PRIVOXY=${NZBGETVPN_ENVIRONMENT_ENABLE_PRIVOXY} - - LAN_NETWORK=${LAN_NETWORK} - - NAME_SERVERS=${NS1},${NS2} + - LAN_NETWORK=${NZBGETVPN_ENVIRONMENT_LAN_NETWORK} + - NAME_SERVERS=${NZBGETVPN_ENVIRONMENT_NAME_SERVERS} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - - VPN_CLIENT=${VPN_CLIENT} - - VPN_ENABLED=${VPN_ENABLE} - - VPN_OPTIONS=${VPN_OPTIONS} - - VPN_PASS=${VPN_PASS} - - VPN_PROV=${VPN_PROV} - - VPN_USER=${VPN_USER} + - VPN_CLIENT=${NZBGETVPN_ENVIRONMENT_VPN_CLIENT} + - VPN_ENABLED=${NZBGETVPN_ENVIRONMENT_VPN_ENABLE} + - VPN_INPUT_PORTS=${NZBGETVPN_ENVIRONMENT_VPN_INPUT_PORTS} + - VPN_OPTIONS=${NZBGETVPN_ENVIRONMENT_VPN_OPTIONS} + - VPN_OUTPUT_PORTS=${NZBGETVPN_ENVIRONMENT_VPN_OUTPUT_PORTS} + - VPN_PASS=${NZBGETVPN_ENVIRONMENT_VPN_PASS} + - VPN_PROV=${NZBGETVPN_ENVIRONMENT_VPN_PROV} + - VPN_USER=${NZBGETVPN_ENVIRONMENT_VPN_USER} privileged: true restart: ${NZBGETVPN_RESTART} sysctls: @@ -25,5 +27,3 @@ services: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_CONFIG}/nzbgetvpn:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${VPN_VOLUME_OVPNDIR}:/config/openvpn - - ${VPN_VOLUME_WGDIR}:/config/wireguard diff --git a/compose/.apps/qbittorrentvpn/qbittorrentvpn.aarch64.yml b/compose/.apps/qbittorrentvpn/qbittorrentvpn.aarch64.yml new file mode 100644 index 0000000000..7abdc385e4 --- /dev/null +++ b/compose/.apps/qbittorrentvpn/qbittorrentvpn.aarch64.yml @@ -0,0 +1,3 @@ +services: + qbittorrentvpn: + image: ghcr.io/binhex/arch-qbittorrentvpn:${QBITTORRENTVPN_TAG} diff --git a/compose/.apps/qbittorrentvpn/qbittorrentvpn.labels.yml b/compose/.apps/qbittorrentvpn/qbittorrentvpn.labels.yml index abdfaed2b9..03a9ca5134 100644 --- a/compose/.apps/qbittorrentvpn/qbittorrentvpn.labels.yml +++ b/compose/.apps/qbittorrentvpn/qbittorrentvpn.labels.yml @@ -1,13 +1,22 @@ services: qbittorrentvpn: labels: - com.dockstarter.appinfo.deprecated: "true" - com.dockstarter.appinfo.description: "(DEPRECATED) Use qBittorrent PrivoxyVPN" + com.dockstarter.appinfo.deprecated: "false" + com.dockstarter.appinfo.description: "qBittorrent PrivoxyVPN" com.dockstarter.appinfo.nicename: "qBittorrentVPN" com.dockstarter.appvars.qbittorrentvpn_enabled: "false" com.dockstarter.appvars.qbittorrentvpn_environment_enable_privoxy: "no" + com.dockstarter.appvars.qbittorrentvpn_environment_lan_network: "192.168.x.x/24" + com.dockstarter.appvars.qbittorrentvpn_environment_name_servers: "1.1.1.1,8.8.8.8" + com.dockstarter.appvars.qbittorrentvpn_environment_vpn_client: "openvpn" + com.dockstarter.appvars.qbittorrentvpn_environment_vpn_enable: "no" + com.dockstarter.appvars.qbittorrentvpn_environment_vpn_input_ports: "" + com.dockstarter.appvars.qbittorrentvpn_environment_vpn_options: "" + com.dockstarter.appvars.qbittorrentvpn_environment_vpn_output_ports: "" + com.dockstarter.appvars.qbittorrentvpn_environment_vpn_pass: "your-vpn-pass" + com.dockstarter.appvars.qbittorrentvpn_environment_vpn_prov: "custom" + com.dockstarter.appvars.qbittorrentvpn_environment_vpn_user: "your-vpn-user" com.dockstarter.appvars.qbittorrentvpn_network_mode: "" - com.dockstarter.appvars.qbittorrentvpn_port_51413: "51413" com.dockstarter.appvars.qbittorrentvpn_port_6881: "6881" com.dockstarter.appvars.qbittorrentvpn_port_8080: "8080" com.dockstarter.appvars.qbittorrentvpn_port_8118: "8118" diff --git a/compose/.apps/qbittorrentvpn/qbittorrentvpn.ports.yml b/compose/.apps/qbittorrentvpn/qbittorrentvpn.ports.yml index e5106bb25c..7f8876087a 100644 --- a/compose/.apps/qbittorrentvpn/qbittorrentvpn.ports.yml +++ b/compose/.apps/qbittorrentvpn/qbittorrentvpn.ports.yml @@ -1,8 +1,6 @@ services: qbittorrentvpn: ports: - - ${QBITTORRENTVPN_PORT_51413}:51413 - - ${QBITTORRENTVPN_PORT_51413}:51413/udp - ${QBITTORRENTVPN_PORT_6881}:6881 - ${QBITTORRENTVPN_PORT_6881}:6881/udp - ${QBITTORRENTVPN_PORT_8080}:${QBITTORRENTVPN_PORT_8080} diff --git a/compose/.apps/qbittorrentvpn/qbittorrentvpn.yml b/compose/.apps/qbittorrentvpn/qbittorrentvpn.yml index b16a02fd4c..7e70c7f205 100644 --- a/compose/.apps/qbittorrentvpn/qbittorrentvpn.yml +++ b/compose/.apps/qbittorrentvpn/qbittorrentvpn.yml @@ -6,17 +6,19 @@ services: container_name: qbittorrentvpn environment: - ENABLE_PRIVOXY=${QBITTORRENTVPN_ENVIRONMENT_ENABLE_PRIVOXY} - - LAN_NETWORK=${LAN_NETWORK} - - NAME_SERVERS=${NS1},${NS2} + - LAN_NETWORK=${QBITTORRENTVPN_ENVIRONMENT_LAN_NETWORK} + - NAME_SERVERS=${QBITTORRENTVPN_ENVIRONMENT_NAME_SERVERS} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - - VPN_CLIENT=${VPN_CLIENT} - - VPN_ENABLED=${VPN_ENABLE} - - VPN_OPTIONS=${VPN_OPTIONS} - - VPN_PASS=${VPN_PASS} - - VPN_PROV=${VPN_PROV} - - VPN_USER=${VPN_USER} + - VPN_CLIENT=${QBITTORRENTVPN_ENVIRONMENT_VPN_CLIENT} + - VPN_ENABLED=${QBITTORRENTVPN_ENVIRONMENT_VPN_ENABLE} + - VPN_INPUT_PORTS=${QBITTORRENTVPN_ENVIRONMENT_VPN_INPUT_PORTS} + - VPN_OPTIONS=${QBITTORRENTVPN_ENVIRONMENT_VPN_OPTIONS} + - VPN_OUTPUT_PORTS=${QBITTORRENTVPN_ENVIRONMENT_VPN_OUTPUT_PORTS} + - VPN_PASS=${QBITTORRENTVPN_ENVIRONMENT_VPN_PASS} + - VPN_PROV=${QBITTORRENTVPN_ENVIRONMENT_VPN_PROV} + - VPN_USER=${QBITTORRENTVPN_ENVIRONMENT_VPN_USER} - WEBUI_PORT=${QBITTORRENTVPN_PORT_8080} privileged: true restart: ${QBITTORRENTVPN_RESTART} @@ -26,5 +28,3 @@ services: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_CONFIG}/qbittorrentvpn:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${VPN_VOLUME_OVPNDIR}:/config/openvpn - - ${VPN_VOLUME_WGDIR}:/config/wireguard diff --git a/compose/.apps/rtorrentvpn/rtorrentvpn.labels.yml b/compose/.apps/rtorrentvpn/rtorrentvpn.labels.yml index b11d6d816c..e77e1a9ff4 100644 --- a/compose/.apps/rtorrentvpn/rtorrentvpn.labels.yml +++ b/compose/.apps/rtorrentvpn/rtorrentvpn.labels.yml @@ -2,7 +2,7 @@ services: rtorrentvpn: labels: com.dockstarter.appinfo.deprecated: "true" - com.dockstarter.appinfo.description: "(DEPRECATED) Use qBittorrent with PrivoxyVPN" + com.dockstarter.appinfo.description: "(DEPRECATED) rTorrent with PrivoxyVPN" com.dockstarter.appinfo.nicename: "rTorrentVPN" com.dockstarter.appvars.rtorrentvpn_enabled: "false" com.dockstarter.appvars.rtorrentvpn_environment_enable_autodl_irssi: "no" diff --git a/compose/.apps/sabnzbdvpn/sabnzbdvpn.labels.yml b/compose/.apps/sabnzbdvpn/sabnzbdvpn.labels.yml index d2bdf003b6..daea00cbce 100644 --- a/compose/.apps/sabnzbdvpn/sabnzbdvpn.labels.yml +++ b/compose/.apps/sabnzbdvpn/sabnzbdvpn.labels.yml @@ -1,11 +1,21 @@ services: sabnzbdvpn: labels: - com.dockstarter.appinfo.deprecated: "true" - com.dockstarter.appinfo.description: "(DEPRECATED) Use SABnzbd with PrivoxyVPN" + com.dockstarter.appinfo.deprecated: "false" + com.dockstarter.appinfo.description: "SABnzbd with PrivoxyVPN" com.dockstarter.appinfo.nicename: "SABnzbdVPN" com.dockstarter.appvars.sabnzbdvpn_enabled: "false" com.dockstarter.appvars.sabnzbdvpn_environment_enable_privoxy: "no" + com.dockstarter.appvars.sabnzbdvpn_environment_lan_network: "192.168.x.x/24" + com.dockstarter.appvars.sabnzbdvpn_environment_name_servers: "1.1.1.1,8.8.8.8" + com.dockstarter.appvars.sabnzbdvpn_environment_vpn_client: "openvpn" + com.dockstarter.appvars.sabnzbdvpn_environment_vpn_enable: "no" + com.dockstarter.appvars.sabnzbdvpn_environment_vpn_input_ports: "" + com.dockstarter.appvars.sabnzbdvpn_environment_vpn_options: "" + com.dockstarter.appvars.sabnzbdvpn_environment_vpn_output_ports: "" + com.dockstarter.appvars.sabnzbdvpn_environment_vpn_pass: "your-vpn-pass" + com.dockstarter.appvars.sabnzbdvpn_environment_vpn_prov: "custom" + com.dockstarter.appvars.sabnzbdvpn_environment_vpn_user: "your-vpn-user" com.dockstarter.appvars.sabnzbdvpn_network_mode: "" com.dockstarter.appvars.sabnzbdvpn_port_8080: "8080" com.dockstarter.appvars.sabnzbdvpn_port_8090: "8090" diff --git a/compose/.apps/sabnzbdvpn/sabnzbdvpn.yml b/compose/.apps/sabnzbdvpn/sabnzbdvpn.yml index ed8a4cc633..e0d40a29ee 100644 --- a/compose/.apps/sabnzbdvpn/sabnzbdvpn.yml +++ b/compose/.apps/sabnzbdvpn/sabnzbdvpn.yml @@ -6,17 +6,19 @@ services: container_name: sabnzbdvpn environment: - ENABLE_PRIVOXY=${SABNZBDVPN_ENVIRONMENT_ENABLE_PRIVOXY} - - LAN_NETWORK=${LAN_NETWORK} - - NAME_SERVERS=${NS1},${NS2} + - LAN_NETWORK=${SABNZBDVPN_ENVIRONMENT_LAN_NETWORK} + - NAME_SERVERS=${SABNZBDVPN_ENVIRONMENT_NAME_SERVERS} - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} - - VPN_CLIENT=${VPN_CLIENT} - - VPN_ENABLED=${VPN_ENABLE} - - VPN_OPTIONS=${VPN_OPTIONS} - - VPN_PASS=${VPN_PASS} - - VPN_PROV=${VPN_PROV} - - VPN_USER=${VPN_USER} + - VPN_CLIENT=${SABNZBDVPN_ENVIRONMENT_VPN_CLIENT} + - VPN_ENABLED=${SABNZBDVPN_ENVIRONMENT_VPN_ENABLE} + - VPN_INPUT_PORTS=${SABNZBDVPN_ENVIRONMENT_VPN_INPUT_PORTS} + - VPN_OPTIONS=${SABNZBDVPN_ENVIRONMENT_VPN_OPTIONS} + - VPN_OUTPUT_PORTS=${SABNZBDVPN_ENVIRONMENT_VPN_OUTPUT_PORTS} + - VPN_PASS=${SABNZBDVPN_ENVIRONMENT_VPN_PASS} + - VPN_PROV=${SABNZBDVPN_ENVIRONMENT_VPN_PROV} + - VPN_USER=${SABNZBDVPN_ENVIRONMENT_VPN_USER} privileged: true restart: ${SABNZBDVPN_RESTART} sysctls: @@ -25,5 +27,3 @@ services: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_CONFIG}/sabnzbdvpn:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${VPN_VOLUME_OVPNDIR}:/config/openvpn - - ${VPN_VOLUME_WGDIR}:/config/wireguard diff --git a/compose/.apps/transmissionvpn/transmissionvpn.labels.yml b/compose/.apps/transmissionvpn/transmissionvpn.labels.yml index 467957846e..33c0d28c87 100644 --- a/compose/.apps/transmissionvpn/transmissionvpn.labels.yml +++ b/compose/.apps/transmissionvpn/transmissionvpn.labels.yml @@ -1,16 +1,19 @@ services: transmissionvpn: labels: - com.dockstarter.appinfo.deprecated: "true" - com.dockstarter.appinfo.description: "(DEPRECATED) Use Transmission with PrivoxyVPN" + com.dockstarter.appinfo.deprecated: "false" + com.dockstarter.appinfo.description: "Transmission with OpenVPN" com.dockstarter.appinfo.nicename: "TransmissionVPN" com.dockstarter.appvars.transmissionvpn_enabled: "false" com.dockstarter.appvars.transmissionvpn_environment_download_dir: "/storage/downloads/completed" + com.dockstarter.appvars.transmissionvpn_environment_home: "/config" com.dockstarter.appvars.transmissionvpn_environment_incomplete_dir: "/storage/downloads/incomplete" + com.dockstarter.appvars.transmissionvpn_environment_local_network: "192.168.x.x/24" + com.dockstarter.appvars.transmissionvpn_environment_openvpn_password: "your-vpn-pass" + com.dockstarter.appvars.transmissionvpn_environment_openvpn_provider: "custom" + com.dockstarter.appvars.transmissionvpn_environment_openvpn_username: "your-vpn-user" com.dockstarter.appvars.transmissionvpn_environment_watch_dir: "/storage/downloads/watch" com.dockstarter.appvars.transmissionvpn_network_mode: "" - com.dockstarter.appvars.transmissionvpn_port_51413: "51413" - com.dockstarter.appvars.transmissionvpn_port_6881: "6881" com.dockstarter.appvars.transmissionvpn_port_9091: "9091" com.dockstarter.appvars.transmissionvpn_restart: "unless-stopped" com.dockstarter.appvars.transmissionvpn_tag: "latest" diff --git a/compose/.apps/transmissionvpn/transmissionvpn.ports.yml b/compose/.apps/transmissionvpn/transmissionvpn.ports.yml index b0672a03f5..706ebe31a6 100644 --- a/compose/.apps/transmissionvpn/transmissionvpn.ports.yml +++ b/compose/.apps/transmissionvpn/transmissionvpn.ports.yml @@ -1,8 +1,4 @@ services: transmissionvpn: ports: - - ${TRANSMISSIONVPN_PORT_51413}:51413 - - ${TRANSMISSIONVPN_PORT_51413}:51413/udp - - ${TRANSMISSIONVPN_PORT_6881}:6881 - - ${TRANSMISSIONVPN_PORT_6881}:6881/udp - ${TRANSMISSIONVPN_PORT_9091}:9091 diff --git a/compose/.apps/transmissionvpn/transmissionvpn.yml b/compose/.apps/transmissionvpn/transmissionvpn.yml index fa0d2c075e..e9d1a48550 100644 --- a/compose/.apps/transmissionvpn/transmissionvpn.yml +++ b/compose/.apps/transmissionvpn/transmissionvpn.yml @@ -3,22 +3,15 @@ services: cap_add: - NET_ADMIN container_name: transmissionvpn - devices: - - /dev/net/tun - dns: - - ${NS1} - - ${NS2} environment: - - CREATE_TUN_DEVICE=true - - LOCAL_NETWORK=${LAN_NETWORK} - - OPENVPN_OPTS=${VPN_OPTIONS} - - OPENVPN_PASSWORD=${VPN_PASS} - - OPENVPN_PROVIDER=${VPN_PROV} - - OPENVPN_USERNAME=${VPN_USER} + - LOCAL_NETWORK=${TRANSMISSIONVPN_ENVIRONMENT_LOCAL_NETWORK} + - OPENVPN_PASSWORD=${TRANSMISSIONVPN_ENVIRONMENT_OPENVPN_PASSWORD} + - OPENVPN_PROVIDER=${TRANSMISSIONVPN_ENVIRONMENT_OPENVPN_PROVIDER} + - OPENVPN_USERNAME=${TRANSMISSIONVPN_ENVIRONMENT_OPENVPN_USERNAME} - PGID=${PGID} - PUID=${PUID} - TRANSMISSION_DOWNLOAD_DIR=${TRANSMISSIONVPN_ENVIRONMENT_DOWNLOAD_DIR} - - TRANSMISSION_HOME=/config + - TRANSMISSION_HOME=${TRANSMISSIONVPN_ENVIRONMENT_HOME} - TRANSMISSION_INCOMPLETE_DIR=${TRANSMISSIONVPN_ENVIRONMENT_INCOMPLETE_DIR} - TRANSMISSION_WATCH_DIR=${TRANSMISSIONVPN_ENVIRONMENT_WATCH_DIR} - TZ=${TZ} @@ -27,5 +20,3 @@ services: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_CONFIG}/transmissionvpn:/config - ${DOCKER_VOLUME_STORAGE}:/storage - - ${VPN_VOLUME_OVPNDIR}:/config/openvpn - - ${VPN_VOLUME_OVPNDIR}:/etc/openvpn/custom diff --git a/docs/apps/delugevpn.md b/docs/apps/delugevpn.md index 7ae8620b99..744574b097 100644 --- a/docs/apps/delugevpn.md +++ b/docs/apps/delugevpn.md @@ -1,9 +1,5 @@ # DelugeVPN -## DEPRECATED - -DEPRECATION NOTICE: This image is deprecated as of 2024-02-18. Use Deluge with Gluetun or PrivoxyVPN. - [![Docker Pulls](https://img.shields.io/docker/pulls/binhex/arch-delugevpn?style=flat-square&color=607D8B&label=docker%20pulls&logo=docker)](https://hub.docker.com/r/binhex/arch-delugevpn) [![GitHub Stars](https://img.shields.io/github/stars/binhex/arch-delugevpn?style=flat-square&color=607D8B&label=github%20stars&logo=github)](https://github.com/binhex/arch-delugevpn) [![Compose Templates](https://img.shields.io/static/v1?style=flat-square&color=607D8B&label=compose&message=templates)](https://github.com/GhostWriters/DockSTARTer/tree/master/compose/.apps/delugevpn) diff --git a/docs/apps/nzbget.md b/docs/apps/nzbget.md index d5104787eb..d28a1e10b0 100644 --- a/docs/apps/nzbget.md +++ b/docs/apps/nzbget.md @@ -1,9 +1,5 @@ # NZBGet -## DEPRECATED - -DEPRECATION NOTICE: This image is deprecated as of 2023-06-02. Use SABnzbd. - [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/nzbget?style=flat-square&color=607D8B&label=docker%20pulls&logo=docker)](https://hub.docker.com/r/linuxserver/nzbget) [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-nzbget?style=flat-square&color=607D8B&label=github%20stars&logo=github)](https://github.com/linuxserver/docker-nzbget) [![Compose Templates](https://img.shields.io/static/v1?style=flat-square&color=607D8B&label=compose&message=templates)](https://github.com/GhostWriters/DockSTARTer/tree/master/compose/.apps/nzbget) diff --git a/docs/apps/nzbgetvpn.md b/docs/apps/nzbgetvpn.md index 791ce57afa..8f4ae3f5d3 100644 --- a/docs/apps/nzbgetvpn.md +++ b/docs/apps/nzbgetvpn.md @@ -1,9 +1,5 @@ # NZBGetVPN -## DEPRECATED - -DEPRECATION NOTICE: This image is deprecated as of 2023-06-02. Use SABnzbd with Gluetun or PrivoxyVPN. - [![Docker Pulls](https://img.shields.io/docker/pulls/jshridha/docker-nzbgetvpn?style=flat-square&color=607D8B&label=docker%20pulls&logo=docker)](https://hub.docker.com/r/jshridha/docker-nzbgetvpn) [![GitHub Stars](https://img.shields.io/github/stars/jshridha/docker-nzbgetvpn?style=flat-square&color=607D8B&label=github%20stars&logo=github)](https://github.com/jshridha/docker-nzbgetvpn) [![Compose Templates](https://img.shields.io/static/v1?style=flat-square&color=607D8B&label=compose&message=templates)](https://github.com/GhostWriters/DockSTARTer/tree/master/compose/.apps/nzbgetvpn) diff --git a/docs/apps/sabnzbdvpn.md b/docs/apps/sabnzbdvpn.md index d59592050f..3613ef4907 100644 --- a/docs/apps/sabnzbdvpn.md +++ b/docs/apps/sabnzbdvpn.md @@ -1,9 +1,5 @@ # SABnzbdVPN -## DEPRECATED - -DEPRECATION NOTICE: This image is deprecated as of 2024-02-18. Use SABnzbd with Gluetun or PrivoxyVPN. - [![Docker Pulls](https://img.shields.io/docker/pulls/binhex/arch-sabnzbdvpn?style=flat-square&color=607D8B&label=docker%20pulls&logo=docker)](https://hub.docker.com/r/binhex/arch-sabnzbdvpn) [![GitHub Stars](https://img.shields.io/github/stars/binhex/arch-sabnzbdvpn?style=flat-square&color=607D8B&label=github%20stars&logo=github)](https://github.com/binhex/arch-sabnzbdvpn) [![Compose Templates](https://img.shields.io/static/v1?style=flat-square&color=607D8B&label=compose&message=templates)](https://github.com/GhostWriters/DockSTARTer/tree/master/compose/.apps/sabnzbdvpn) diff --git a/docs/apps/transmissionvpn.md b/docs/apps/transmissionvpn.md index 2e7226dc1e..b0ab46fb09 100644 --- a/docs/apps/transmissionvpn.md +++ b/docs/apps/transmissionvpn.md @@ -1,9 +1,5 @@ # TransmissionVPN -## DEPRECATED - -DEPRECATION NOTICE: This image is deprecated as of 2024-02-18. Use Transmission with Gluetun or PrivoxyVPN. - [![Docker Pulls](https://img.shields.io/docker/pulls/haugene/transmission-openvpn?style=flat-square&color=607D8B&label=docker%20pulls&logo=docker)](https://hub.docker.com/r/haugene/transmission-openvpn) [![GitHub Stars](https://img.shields.io/github/stars/haugene/docker-transmission-openvpn?style=flat-square&color=607D8B&label=github%20stars&logo=github)](https://github.com/haugene/docker-transmission-openvpn) [![Compose Templates](https://img.shields.io/static/v1?style=flat-square&color=607D8B&label=compose&message=templates)](https://github.com/GhostWriters/DockSTARTer/tree/master/compose/.apps/transmissionvpn)