-
Notifications
You must be signed in to change notification settings - Fork 50
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #221 from binhex/fix_password
Fix password
- Loading branch information
Showing
3 changed files
with
115 additions
and
84 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,84 +1,138 @@ | ||
| #!/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}" | ||
|
|
||
| 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 | ||
| function configure_incoming_port(){ | ||
|
|
||
| # make sure process qbittorrent-nox DOES exist | ||
| retry_count=12 | ||
| retry_wait=1 | ||
| while true; do | ||
| # 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 | ||
|
|
||
| if ! pgrep -x "qbittorrent-nox" > /dev/null; 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 | ||
|
|
||
| retry_count=$((retry_count-1)) | ||
| if [ "${retry_count}" -eq "0" ]; then | ||
| # 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 | ||
|
|
||
| echo "[warn] Wait for qBittorrent process to start aborted, too many retries" | ||
| echo "[info] Showing output from command before exit..." | ||
| timeout 10 yes | /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}" --profile=/config ; return 1 | ||
| # set qbittorrent port to current vpn port (used when checking for changes on next run)s | ||
| qbittorrent_port="${VPN_INCOMING_PORT}" | ||
|
|
||
| else | ||
| fi | ||
|
|
||
| if [[ "${DEBUG}" == "true" ]]; then | ||
| echo "[debug] Waiting for qBittorrent process to start" | ||
| echo "[debug] Re-check in ${retry_wait} secs..." | ||
| echo "[debug] ${retry_count} retries left" | ||
| fi | ||
| sleep "${retry_wait}s" | ||
| # set qbittorrent ip to current vpn ip (used when checking for changes on next run) | ||
| qbittorrent_ip="${vpn_ip}" | ||
|
|
||
| fi | ||
| } | ||
|
|
||
| else | ||
| function start() { | ||
|
|
||
| echo "[info] qBittorrent process started" | ||
| break | ||
| if [[ "${qbittorrent_running}" == "false" ]]; then | ||
|
|
||
| fi | ||
| # define destination file path for qbittorrent config file | ||
| qbittorrent_config="/config/qBittorrent/config/qBittorrent.conf" | ||
|
|
||
| done | ||
| # copy config if it doesn't exist and set line endings | ||
| init_qbittorrent | ||
|
|
||
| echo "[info] Waiting for qBittorrent process to start listening on port ${WEBUI_PORT}..." | ||
| # edit qbittorrent config | ||
| edit_qbittorrent_config | ||
|
|
||
| while [[ $(netstat -lnt | awk "\$6 == \"LISTEN\" && \$4 ~ \".${WEBUI_PORT}\"") == "" ]]; do | ||
| sleep 0.1 | ||
| done | ||
| echo "[info] Attempting to start qBittorrent..." | ||
|
|
||
| echo "[info] qBittorrent process listening on port ${WEBUI_PORT}" | ||
| # 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 & | ||
|
|
||
| fi | ||
| # make sure process qbittorrent-nox DOES exist | ||
| retry_count=12 | ||
| retry_wait=1 | ||
| while true; do | ||
|
|
||
| # 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 | ||
| if ! pgrep "qbittorrent-nox" > /dev/null; 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 | ||
| retry_count=$((retry_count-1)) | ||
| if [ "${retry_count}" -eq "0" ]; then | ||
|
|
||
| echo "[warn] Wait for qBittorrent process to start aborted, too many retries" | ||
| echo "[info] Showing output from command before exit..." | ||
| timeout 10 yes | /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}" --profile=/config ; return 1 | ||
|
|
||
| else | ||
|
|
||
| if [[ "${DEBUG}" == "true" ]]; then | ||
| echo "[debug] Waiting for qBittorrent process to start" | ||
| echo "[debug] Re-check in ${retry_wait} secs..." | ||
| echo "[debug] ${retry_count} retries left" | ||
| fi | ||
| sleep "${retry_wait}s" | ||
|
|
||
| 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 | ||
| else | ||
|
|
||
| echo "[info] qBittorrent process started" | ||
| break | ||
|
|
||
| fi | ||
|
|
||
| done | ||
|
|
||
| echo "[info] Waiting for qBittorrent process to start listening on port ${WEBUI_PORT}..." | ||
|
|
||
| while [[ $(netstat -lnt | awk "\$6 == \"LISTEN\" && \$4 ~ \".${WEBUI_PORT}\"") == "" ]]; do | ||
| sleep 0.1 | ||
| done | ||
|
|
||
| echo "[info] qBittorrent process listening on port ${WEBUI_PORT}" | ||
|
|
||
| fi | ||
|
|
||
| # 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters