Fixing startup of tinyproxy on alpine, also add a missing env var to export #1334

openvpn/persistEnvironment.py

@@ -20,6 +20,7 @@ wanted_variables = {
     'DROP_DEFAULT_ROUTE',
     'GLOBAL_APPLY_PERMISSIONS',
     'LOG_TO_STDOUT',
+    'DISABLE_PORT_UPDATER',
 }
 
 variables_to_persist = {}

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