From 7e0281bc21f4e8c1b45c91632e76f377bb9cd6d9 Mon Sep 17 00:00:00 2001
From: litinoveweedle <15144712+litinoveweedle@users.noreply.github.com>
Date: Sun, 25 Jan 2026 17:40:17 +0100
Subject: [PATCH] remove unnecessary OpeVPN scripts

---
 .../rootfs/etc/cont-init.d/93-openvpn.sh      |  6 --
 qbittorrent/rootfs/etc/openvpn/.gitkeep       |  0
 qbittorrent/rootfs/etc/openvpn/down.sh        | 36 -------
 .../rootfs/etc/openvpn/up-qbittorrent.sh      |  9 --
 qbittorrent/rootfs/etc/openvpn/up.sh          | 97 -------------------
 5 files changed, 148 deletions(-)
 create mode 100644 qbittorrent/rootfs/etc/openvpn/.gitkeep
 delete mode 100755 qbittorrent/rootfs/etc/openvpn/down.sh
 delete mode 100755 qbittorrent/rootfs/etc/openvpn/up-qbittorrent.sh
 delete mode 100755 qbittorrent/rootfs/etc/openvpn/up.sh

diff --git a/qbittorrent/rootfs/etc/cont-init.d/93-openvpn.sh b/qbittorrent/rootfs/etc/cont-init.d/93-openvpn.sh
index d1dff3c77..0bab9a487 100755
--- a/qbittorrent/rootfs/etc/cont-init.d/93-openvpn.sh
+++ b/qbittorrent/rootfs/etc/cont-init.d/93-openvpn.sh
@@ -184,12 +184,6 @@ if bashio::config.true 'openvpn_enabled'; then
     chmod 755 /config/openvpn/*
     chmod 755 /etc/openvpn/*
     chmod 600 /etc/openvpn/credentials
-    chmod 755 /etc/openvpn/up.sh
-    chmod 755 /etc/openvpn/down.sh
-    chmod 755 /etc/openvpn/up-qbittorrent.sh
-    chmod +x /etc/openvpn/up.sh
-    chmod +x /etc/openvpn/down.sh
-    chmod +x /etc/openvpn/up-qbittorrent.sh
 
     echo "... openvpn correctly set, qbittorrent will run tunnelled through openvpn"
 
diff --git a/qbittorrent/rootfs/etc/openvpn/.gitkeep b/qbittorrent/rootfs/etc/openvpn/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/qbittorrent/rootfs/etc/openvpn/down.sh b/qbittorrent/rootfs/etc/openvpn/down.sh
deleted file mode 100755
index 57d18e39b..000000000
--- a/qbittorrent/rootfs/etc/openvpn/down.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-# shellcheck disable=SC2154,SC2004,SC2059,SC2086
-# Copyright (c) 2006-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Roy Marples (uberlord@gentoo.org)
-
-# If we have a service specific script, run this now
-if [ -x /etc/openvpn/"${RC_SVCNAME}"-down.sh ]; then
-    /etc/openvpn/"${RC_SVCNAME}"-down.sh "$@"
-fi
-
-# Restore resolv.conf to how it was
-if [ "${PEER_DNS}" != "no" ]; then
-    if [ -x /sbin/resolvconf ]; then
-        /sbin/resolvconf -d "${dev}"
-    elif [ -e /etc/resolv.conf-"${dev}".sv ]; then
-        # Important that we cat instead of move incase resolv.conf is
-        # a symlink and not an actual file
-        cat /etc/resolv.conf-"${dev}".sv > /etc/resolv.conf
-        rm -f /etc/resolv.conf-"${dev}".sv
-    fi
-fi
-
-if [ -n "${RC_SVCNAME}" ]; then
-    # Re-enter the init script to start any dependant services
-    if /etc/init.d/"${RC_SVCNAME}" --quiet status; then
-        export IN_BACKGROUND=true
-        if [ -d /var/run/s6/container_environment ]; then printf "%s" "true" > /var/run/s6/container_environment/IN_BACKGROUND; fi
-        printf "%s\n" "IN_BACKGROUND=\"true\"" >> ~/.bashrc
-        /etc/init.d/"${RC_SVCNAME}" --quiet stop
-    fi
-fi
-
-exit 0
-
-# vim: ts=4 :
diff --git a/qbittorrent/rootfs/etc/openvpn/up-qbittorrent.sh b/qbittorrent/rootfs/etc/openvpn/up-qbittorrent.sh
deleted file mode 100755
index 0f0101dbc..000000000
--- a/qbittorrent/rootfs/etc/openvpn/up-qbittorrent.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/with-contenv bashio
-# shellcheck shell=bash
-set -e
-
-WEBUI_PORT=${WEBUI_PORT:-8080}
-
-exec \
-    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost ${WEBUI_PORT}" \
-    s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}"
diff --git a/qbittorrent/rootfs/etc/openvpn/up.sh b/qbittorrent/rootfs/etc/openvpn/up.sh
deleted file mode 100755
index fe5da2bda..000000000
--- a/qbittorrent/rootfs/etc/openvpn/up.sh
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/sh
-# shellcheck disable=SC2154,SC2004,SC2059,SC2086
-
-# launch qbittorrent
-/etc/openvpn/up-qbittorrent.sh "${4}" &
-
-# Copyright (c) 2006-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Roy Marples (uberlord@gentoo.org)
-
-# Setup our resolv.conf
-# Vitally important that we use the domain entry in resolv.conf so we
-# can setup the nameservers are for the domain ONLY in resolvconf if
-# we're using a decent dns cache/forwarder like dnsmasq and NOT nscd/libc.
-# nscd/libc users will get the VPN nameservers before their other ones
-# and will use the first one that responds - maybe the LAN ones?
-# non resolvconf users just the the VPN resolv.conf
-
-# FIXME:- if we have >1 domain, then we have to use search :/
-# We need to add a flag to resolvconf to say
-# "these nameservers should only be used for the listed search domains
-#  if other global nameservers are present on other interfaces"
-# This however, will break compatibility with Debians resolvconf
-# A possible workaround would be to just list multiple domain lines
-# and try and let resolvconf handle it
-
-if [ "${PEER_DNS}" != "no" ]; then
-    NS=
-    DOMAIN=
-    SEARCH=
-    i=1
-    while true; do
-        eval opt=\$foreign_option_${i}
-        [ -z "${opt}" ] && break
-        if [ "${opt}" != "${opt#dhcp-option DOMAIN *}" ]; then
-            if [ -z "${DOMAIN}" ]; then
-                DOMAIN="${opt#dhcp-option DOMAIN *}"
-            else
-                SEARCH="${SEARCH}${SEARCH:+ }${opt#dhcp-option DOMAIN *}"
-            fi
-        elif [ "${opt}" != "${opt#dhcp-option DNS *}" ]; then
-            NS="${NS}nameserver ${opt#dhcp-option DNS *}\n"
-        fi
-        i=$((${i} + 1))
-    done
-
-    if [ -n "${NS}" ]; then
-        DNS="# Generated by openvpn for interface ${dev}\n"
-        if [ -n "${SEARCH}" ]; then
-            DNS="${DNS}search ${DOMAIN} ${SEARCH}\n"
-        elif [ -n "${DOMAIN}" ]; then
-            DNS="${DNS}domain ${DOMAIN}\n"
-        fi
-        DNS="${DNS}${NS}"
-        if [ -x /sbin/resolvconf ]; then
-            printf "${DNS}" | /sbin/resolvconf -a "${dev}"
-        else
-            # Preserve the existing resolv.conf
-            if [ -e /etc/resolv.conf ]; then
-                cp /etc/resolv.conf /etc/resolv.conf-"${dev}".sv
-            fi
-            printf "${DNS}" > /etc/resolv.conf
-            chmod 644 /etc/resolv.conf
-        fi
-    fi
-fi
-
-# Below section is Gentoo specific
-# Quick summary - our init scripts are re-entrant and set the RC_SVCNAME env var
-# as we could have >1 openvpn service
-
-if [ -n "${RC_SVCNAME}" ]; then
-    # If we have a service specific script, run this now
-    if [ -x /etc/openvpn/"${RC_SVCNAME}"-up.sh ]; then
-        /etc/openvpn/"${RC_SVCNAME}"-up.sh "$@"
-    fi
-
-    # Re-enter the init script to start any dependant services
-    if ! /etc/init.d/"${RC_SVCNAME}" --quiet status; then
-        export IN_BACKGROUND=true
-        if [ -d /var/run/s6/container_environment ]; then printf "%s" "true" > /var/run/s6/container_environment/IN_BACKGROUND; fi
-        printf "%s\n" "IN_BACKGROUND=\"true\"" >> ~/.bashrc
-        /etc/init.d/${RC_SVCNAME} --quiet start
-    fi
-fi
-
-###############
-# ALLOW WEBUI #
-###############
-
-ip route add 10.0.0.0/8 via 172.30.32.1
-ip route add 192.168.0.0/16 via 172.30.32.1
-ip route add 172.16.0.0/12 via 172.30.32.1
-
-exit 0
-
-# vim: ts=4 :