From 2d34ea860f06167d2fc00cb27b652823d213d2a1 Mon Sep 17 00:00:00 2001
From: Kristian Haugene <kristian@haugene.net>
Date: Wed, 28 Oct 2020 22:37:19 +0100
Subject: [PATCH] Fixing startup of tinyproxy on alpine, also add a missing env
 var to export #1334

---
 openvpn/persistEnvironment.py | 1 +
 tinyproxy/start.sh            | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

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