diff --git a/DockerEnv b/DockerEnv index 78617adc0..03d6201dd 100644 --- a/DockerEnv +++ b/DockerEnv @@ -88,3 +88,4 @@ #WEBPROXY_USERNAME= #WEBPROXY_PASSWORD= #DOCKER_LOG=false +#LOG_TO_STDOUT=false diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 67f98a3f5..54fa27dc3 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -53,6 +53,7 @@ ENV OPENVPN_USERNAME=**None** \ WEBPROXY_USERNAME= \ WEBPROXY_PASSWORD= \ DOCKER_LOG=false \ + LOG_TO_STDOUT=false \ HEALTH_CHECK_HOST=google.com HEALTHCHECK --interval=1m CMD /etc/scripts/healthcheck.sh diff --git a/docs/arguments.md b/docs/arguments.md index 74732cc30..534ec5a97 100755 --- a/docs/arguments.md +++ b/docs/arguments.md @@ -105,3 +105,11 @@ This might lead to the default route (your untunneled connection) to be used. To drop the default route set the environment variable `DROP_DEFAULT_ROUTE` to `true`. *Note*: This is not compatible with all VPNs. You can check your iptables routing with the `ip r` command in a running container. + +### Changing logging locations + +By default Transmission will log to a file in `TRANSMISSION_HOME/transmission.log`. + +To log to stdout instead set the environment variable `LOG_TO_STDOUT` to `true`. + +*Note*: By default stdout is what container engines read logs from. Set this to true to have Tranmission logs in commands like `docker logs` and `kubectl logs`. OpenVPN currently only logs to stdout. \ No newline at end of file diff --git a/openvpn/frostvpn/SOURCE.txt b/openvpn/frostvpn/SOURCE.txt index beee78970..a5fba3260 100644 --- a/openvpn/frostvpn/SOURCE.txt +++ b/openvpn/frostvpn/SOURCE.txt @@ -1 +1 @@ -http://www.frostvpn.com/clients/server-list.htm +https://www.frostvpn.com/clients/servers.htm diff --git a/scripts/healthcheck.sh b/scripts/healthcheck.sh index 77ddaf5e7..d24207c7a 100755 --- a/scripts/healthcheck.sh +++ b/scripts/healthcheck.sh @@ -16,6 +16,29 @@ STATUS=$? if [[ ${STATUS} -ne 0 ]] then echo "Network is down" + INTERFACE=$(ls /sys/class/net | grep tun) + ISINTERFACE=$? + + if [[ ${ISINTERFACE} -ne 0 ]] + then + echo "TUN Interface not found" + exit 1 + fi + + echo "Resetting TUN" + ip link set ${INTERFACE} down + sleep 1 + ip link set ${INTERFACE} up + echo "Sent kill SIGUSR1 to openvpn" + pkill -SIGUSR1 openvpn + sleep 20 +fi + +ping -c 1 $HOST +STATUS=$? +if [[ ${STATUS} -ne 0 ]] +then + echo "Network is still down" exit 1 fi diff --git a/transmission/start.sh b/transmission/start.sh index 0970f54b3..361250f24 100755 --- a/transmission/start.sh +++ b/transmission/start.sh @@ -63,7 +63,7 @@ if [[ "true" = "$DROP_DEFAULT_ROUTE" ]]; then ip r del default || exit 1 fi -if [[ "true" = "$DOCKER_LOG" ]]; then +if [[ "true" = "$DOCKER_LOG" || "true" = "$LOG_TO_STDOUT" ]]; then LOGFILE=/dev/stdout else LOGFILE=${TRANSMISSION_HOME}/transmission.log diff --git a/transmission/userSetup.sh b/transmission/userSetup.sh index e645abb74..576d844ca 100644 --- a/transmission/userSetup.sh +++ b/transmission/userSetup.sh @@ -13,7 +13,7 @@ if [ -n "$PUID" ] && [ ! "$(id -u root)" -eq "$PUID" ]; then groupmod -o -g "$PGID" ${RUN_AS}; fi - if [[ "true" = "$DOCKER_LOG" ]]; then + if [[ "true" = "$DOCKER_LOG" || "true" = "$LOG_TO_STDOUT" ]]; then chown ${RUN_AS}:${RUN_AS} /dev/stdout fi