refactor: change vpn script

separate wait_for_vpn and wait_for_gluetun

Author: iPromKnight

apps/alpine/scripts/wait-for-vpn.sh

@@ -1,20 +1,22 @@
 #!/usr/bin/env bash
 
-if [ -z "$WAIT_FOR_VPN" ]; then
-    echo "WAIT_FOR_VPN is empty or not set. Proceeding immediately..."
-else
+TIMEOUT_SECONDS=2
+SLEEP_SECONDS=2
 
-if [[ "${WAIT_FOR_VPN:-"false"}" == "true" ]]; then
-    echo "Waiting for VPN to be connected..."
+if [[ "${WAIT_FOR_VPN:-false}" == "true" ]]; then
+    echo "🔒 Waiting for VPN to be connected..."
     while ! grep -s -q "connected" /shared/vpnstatus; do
-        # Also account for gluetun-style http controller - undocumented feature from https://github.com/qdm12/gluetun/issues/2277#issuecomment-2115964521
-        if (timeout 2s curl -s http://localhost:8000/v1/vpn/status | grep -q running); then
-            break
-        fi
-        echo "VPN not connected"
-        sleep 2
+        echo "VPN not connected yet..."
+        sleep "$SLEEP_SECONDS"
     done
-    echo "VPN Connected, starting application..."
+    echo "✅ VPN Connected. Starting application..."
 fi
 
-fi
+if [[ "${WAIT_FOR_GLUETUN:-false}" == "true" ]]; then
+    echo "🌐 Waiting for Gluetun to be ready..."
+    until timeout "${TIMEOUT_SECONDS}s" bash -c 'curl -s http://localhost:8000/v1/vpn/status | grep -q running'; do
+        echo "Gluetun not ready yet..."
+        sleep "$SLEEP_SECONDS"
+    done
+    echo "✅ Gluetun is ready. Starting application..."
+fi

apps/ubuntu/scripts/wait-for-vpn.sh

@@ -1,20 +1,22 @@
 #!/usr/bin/env bash
 
-if [ -z "$WAIT_FOR_VPN" ]; then
-    echo "WAIT_FOR_VPN is empty or not set. Proceeding immediately..."
-else
+TIMEOUT_SECONDS=2
+SLEEP_SECONDS=2
 
-if [[ "${WAIT_FOR_VPN:-"false"}" == "true" ]]; then
-    echo "Waiting for VPN to be connected..."
+if [[ "${WAIT_FOR_VPN:-false}" == "true" ]]; then
+    echo "🔒 Waiting for VPN to be connected..."
     while ! grep -s -q "connected" /shared/vpnstatus; do
-        # Also account for gluetun-style http controller - undocumented feature from https://github.com/qdm12/gluetun/issues/2277#issuecomment-2115964521
-        if (timeout 2s curl -s http://localhost:8000/v1/vpn/status | grep -q running); then
-            break
-        fi
-        echo "VPN not connected"
-        sleep 2
+        echo "VPN not connected yet..."
+        sleep "$SLEEP_SECONDS"
     done
-    echo "VPN Connected, starting application..."
+    echo "✅ VPN Connected. Starting application..."
 fi
 
+if [[ "${WAIT_FOR_GLUETUN:-false}" == "true" ]]; then
+    echo "🌐 Waiting for Gluetun to be ready..."
+    until timeout "${TIMEOUT_SECONDS}s" bash -c 'curl -s http://localhost:8000/v1/vpn/status | grep -q running'; do
+        echo "Gluetun not ready yet..."
+        sleep "$SLEEP_SECONDS"
+    done
+    echo "✅ Gluetun is ready. Starting application..."
 fi