open-source-mirrors
/
arch-qbittorrentvpn
mirror of https://github.com/binhex/arch-qbittorrentvpn
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove daemon so we get dyn password in log

Browse Source
pull/221/head
binhex 10 months ago
parent 8be0e9eee4
commit 25c4105f39
3 changed files with 115 additions and 84 deletions
Show Stats Download Patch File Download Diff File

6
config/nobody/qbittorrent/config/qBittorrent.conf
Unescape View File

@ -2,10 +2,16 @@
enabled=false
program=
[BitTorrent]
Session\Interface=wg0
Session\InterfaceName=wg0
[Preferences]
General\Locale=en
Connection\PortRangeMin=6881
Connection\UPnP=false
Connection\Interface=wg0
Connection\InterfaceName=wg0
General\UseRandomPort=false
WebUI\CSRFProtection=false
WebUI\LocalHostAuth=false

112
run/nobody/qbittorrent.sh
Unescape View File

@ -1,27 +1,96 @@
#!/usr/bin/dumb-init /bin/bash
if [[ "${qbittorrent_running}" == "false" ]]; then
function edit_qbittorrent_config() {
# set network interface binding to vpn virtual adapter (wg0/tun0/tap0) for qbittorrent on startup
sed -i -e "s~^Connection\\\\Interface\=.*~Connection\\\\Interface\=${VPN_DEVICE_TYPE}~g" "${qbittorrent_config}"
sed -i -e "s~^Connection\\\\InterfaceName\=.*~Connection\\\\InterfaceName\=${VPN_DEVICE_TYPE}~g" "${qbittorrent_config}"
sed -i -e "s~^Session\\\\Interface\=.*~Session\\\\Interface\=${VPN_DEVICE_TYPE}~g" "${qbittorrent_config}"
sed -i -e "s~^Session\\\\InterfaceName\=.*~Session\\\\InterfaceName\=${VPN_DEVICE_TYPE}~g" "${qbittorrent_config}"
# forcibly set allow anonymous access from localhost to api (used to change incoming port)
sed -i -e 's~^WebUI\\LocalHostAuth=.*~WebUI\\LocalHostAuth=false~g' "${qbittorrent_config}"
# set locale to prevent 4.1.4 gui render issues if no locale set
grep -q 'General\\Locale' "${qbittorrent_config}" || sed -i '/\[Preferences\]/a General\\Locale=en' "${qbittorrent_config}"
}
function init_qbittorrent() {
# if qbittorrent config file doesnt exist then copy default to host config volume
if [[ ! -f "${qbittorrent_config}" ]]; then
echo "[info] qBittorrent config file doesnt exist, copying default to '/config/qBittorrent/config/'..."
# copy default qbittorrent config file to /config/qBittorrent/config/
mkdir -p /config/qBittorrent/config && cp /home/nobody/qbittorrent/config/* /config/qBittorrent/config/
else
echo "[info] qBittorrent config file already exists, skipping copy"
fi
echo "[info] Removing session lock file (if it exists)..."
rm -f /config/qBittorrent/data/BT_backup/session.lock
# set network interface binding to vpn virtual adapter (wg0/tun0/tap0) for qbittorrent on startup
sed -i -e "s~^Connection\\\\Interface\=.*~Connection\\\\Interface\=${VPN_DEVICE_TYPE}~g" '/config/qBittorrent/config/qBittorrent.conf'
sed -i -e "s~^Connection\\\\InterfaceName\=.*~Connection\\\\InterfaceName\=${VPN_DEVICE_TYPE}~g" '/config/qBittorrent/config/qBittorrent.conf'
sed -i -e "s~^Session\\\\Interface\=.*~Session\\\\Interface\=${VPN_DEVICE_TYPE}~g" '/config/qBittorrent/config/qBittorrent.conf'
sed -i -e "s~^Session\\\\InterfaceName\=.*~Session\\\\InterfaceName\=${VPN_DEVICE_TYPE}~g" '/config/qBittorrent/config/qBittorrent.conf'
# force unix line endings conversion in case user edited qbittorrent.conf with notepad
/usr/local/bin/dos2unix.sh "${qbittorrent_config}"
}
function configure_incoming_port(){
# change incoming port using the qbittorrent api - note this requires anonymous authentication via webui
# option 'Bypass authentication for clients on localhost'
if [[ "${VPN_PROV}" == "pia" || "${VPN_PROV}" == "protonvpn" ]] && [[ -n "${VPN_INCOMING_PORT}" ]]; then
# identify protocol, used by curl to connect to api
if grep -q 'WebUI\\HTTPS\\Enabled=true' "${qbittorrent_config}"; then
web_protocol="https"
else
web_protocol="http"
fi
# note -k flag required to support insecure connection (self signed certs) when https used
curl -k -i -X POST -d "json={\"random_port\": false}" "${web_protocol}://localhost:${WEBUI_PORT}/api/v2/app/setPreferences" &> /dev/null
curl -k -i -X POST -d "json={\"listen_port\": ${VPN_INCOMING_PORT}}" "${web_protocol}://localhost:${WEBUI_PORT}/api/v2/app/setPreferences" &> /dev/null
# set qbittorrent port to current vpn port (used when checking for changes on next run)s
qbittorrent_port="${VPN_INCOMING_PORT}"
fi
# set qbittorrent ip to current vpn ip (used when checking for changes on next run)
qbittorrent_ip="${vpn_ip}"
}
function start() {
if [[ "${qbittorrent_running}" == "false" ]]; then
# define destination file path for qbittorrent config file
qbittorrent_config="/config/qBittorrent/config/qBittorrent.conf"
# copy config if it doesn't exist and set line endings
init_qbittorrent
# edit qbittorrent config
edit_qbittorrent_config
echo "[info] Attempting to start qBittorrent..."
# run qBittorrent (daemonized, non-blocking) - note qbittorrent requires docker privileged flag
/usr/bin/qbittorrent-nox --daemon --webui-port="${WEBUI_PORT}" --profile=/config
# run qBittorrent (backgrounded, non-blocking) - note qbittorrent requires docker privileged flag
timeout 10 yes | nohup /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}" --profile=/config >> '/config/supervisord.log' 2>&1 &
# make sure process qbittorrent-nox DOES exist
retry_count=12
retry_wait=1
while true; do
if ! pgrep -x "qbittorrent-nox" > /dev/null; then
if ! pgrep "qbittorrent-nox" > /dev/null; then
retry_count=$((retry_count-1))
if [ "${retry_count}" -eq "0" ]; then
@ -58,27 +127,12 @@ if [[ "${qbittorrent_running}" == "false" ]]; then
echo "[info] qBittorrent process listening on port ${WEBUI_PORT}"
fi
# change incoming port using the qbittorrent api - note this requires anonymous authentication via webui
# option 'Bypass authentication for clients on localhost'
if [[ "${VPN_PROV}" == "pia" || "${VPN_PROV}" == "protonvpn" ]] && [[ -n "${VPN_INCOMING_PORT}" ]]; then
# identify protocol, used by curl to connect to api
if grep -q 'WebUI\\HTTPS\\Enabled=true' '/config/qBittorrent/config/qBittorrent.conf'; then
web_protocol="https"
else
web_protocol="http"
fi
# note -k flag required to support insecure connection (self signed certs) when https used
curl -k -i -X POST -d "json={\"random_port\": false}" "${web_protocol}://localhost:${WEBUI_PORT}/api/v2/app/setPreferences" &> /dev/null
curl -k -i -X POST -d "json={\"listen_port\": ${VPN_INCOMING_PORT}}" "${web_protocol}://localhost:${WEBUI_PORT}/api/v2/app/setPreferences" &> /dev/null
# set qbittorrent port to current vpn port (used when checking for changes on next run)s
qbittorrent_port="${VPN_INCOMING_PORT}"
# confgure incoming port
configure_incoming_port
fi
}
# set qbittorrent ip to current vpn ip (used when checking for changes on next run)
qbittorrent_ip="${vpn_ip}"
# kickoff
start

29
run/nobody/watchdog.sh
Unescape View File

@ -1,34 +1,5 @@
#!/usr/bin/dumb-init /bin/bash
# define destination file path for qbittorrent config file
qbittorrent_config="/config/qBittorrent/config/qBittorrent.conf"
# if qbittorrent config file doesnt exist then copy default to host config volume
if [[ ! -f "${qbittorrent_config}" ]]; then
echo "[info] qBittorrent config file doesnt exist, copying default to /config/qBittorrent/config/..."
# copy default qbittorrent config file to /config/qBittorrent/config/
mkdir -p /config/qBittorrent/config && cp /home/nobody/qbittorrent/config/* /config/qBittorrent/config/
else
echo "[info] qBittorrent config file already exists, skipping copy"
fi
echo "[info] Removing session lock file (if it exists)..."
rm -f /config/qBittorrent/data/BT_backup/session.lock
# force unix line endings conversion in case user edited qbittorrent.conf with notepad
/usr/local/bin/dos2unix.sh "${qbittorrent_config}"
# set locale to prevent 4.1.4 gui render issues if no locale set
grep -q 'General\\Locale' "${qbittorrent_config}" || sed -i '/\[Preferences\]/a General\\Locale=en' "${qbittorrent_config}"
# forcibly set allow anonymous access from localhost to api (used to change incoming port)
sed -i 's~^WebUI\\LocalHostAuth=.*~WebUI\\LocalHostAuth=false~g' "${qbittorrent_config}"
# set default values for port and ip
qbittorrent_port="6881"
qbittorrent_ip="0.0.0.0"

Write Preview
Loading…
Cancel
Save