diff --git a/openvpn/persistEnvironment.py b/openvpn/persistEnvironment.py index a8fd15d90..3540b80dd 100644 --- a/openvpn/persistEnvironment.py +++ b/openvpn/persistEnvironment.py @@ -20,6 +20,7 @@ wanted_variables = { 'DROP_DEFAULT_ROUTE', 'GLOBAL_APPLY_PERMISSIONS', 'LOG_TO_STDOUT', + 'DISABLE_PORT_UPDATER', } variables_to_persist = {} diff --git a/tinyproxy/start.sh b/tinyproxy/start.sh index 08341d796..2cce13b58 100755 --- a/tinyproxy/start.sh +++ b/tinyproxy/start.sh @@ -66,7 +66,13 @@ if [[ "${WEBPROXY_ENABLED}" = "true" ]]; then # Lower log level for privacy (writes dns names by default) sed -i -e "s/LogLevel Info/LogLevel Critical/" ${PROXY_CONF} - /etc/init.d/tinyproxy start + if command -v tinyproxy &> /dev/null; then + echo "tinyproxy is on the PATH, run it" + tinyproxy -c ${PROXY_CONF} + else + /etc/init.d/tinyproxy start + fi + echo "Tinyproxy startup script complete." fi