Update apps/rego-tunnel/build/setup-network.sh
Some checks failed
Test / test (push) Has been cancelled
Some checks failed
Test / test (push) Has been cancelled
This commit is contained in:
@@ -23,23 +23,6 @@ TAP2_NAME="${TAP2_NAME:-}"
|
|||||||
BRIDGE2_CIDR="${BRIDGE2_CIDR:-}"
|
BRIDGE2_CIDR="${BRIDGE2_CIDR:-}"
|
||||||
BRIDGE2_UPLINK_IF="${BRIDGE2_UPLINK_IF:-}"
|
BRIDGE2_UPLINK_IF="${BRIDGE2_UPLINK_IF:-}"
|
||||||
|
|
||||||
|
|
||||||
start_gui() {
|
|
||||||
mkdir -p /root/.vnc
|
|
||||||
x11vnc -storepasswd "$VNC_PASSWORD" /root/.vnc/pass >/dev/null 2>&1 || true
|
|
||||||
rm -f /tmp/.X1-lock /tmp/.X11-unix/X1 2>/dev/null || true
|
|
||||||
Xvfb "$DISPLAY_ADDR" -screen 0 ${XVFB_WxHxD:-1280x800x24} +extension RANDR &
|
|
||||||
pids+=($!)
|
|
||||||
sleep 0.5
|
|
||||||
export DISPLAY="$DISPLAY_ADDR"
|
|
||||||
fluxbox >/tmp/fluxbox.log 2>&1 &
|
|
||||||
pids+=($!)
|
|
||||||
x11vnc -display "$DISPLAY_ADDR" -rfbauth /root/.vnc/pass -forever -shared -rfbport 5900 -quiet &
|
|
||||||
pids+=($!)
|
|
||||||
websockify --web=/usr/share/novnc/ 0.0.0.0:"$NOVNC_PORT" localhost:5900 >/tmp/websockify.log 2>&1 &
|
|
||||||
pids+=($!)
|
|
||||||
}
|
|
||||||
|
|
||||||
if [[ "$BRIDGE_CIDR" != */* ]]; then
|
if [[ "$BRIDGE_CIDR" != */* ]]; then
|
||||||
BRIDGE_CIDR="$BRIDGE_CIDR/24"
|
BRIDGE_CIDR="$BRIDGE_CIDR/24"
|
||||||
fi
|
fi
|
||||||
@@ -164,6 +147,3 @@ if [ -n "$BRIDGE2_NAME" ] && [ -n "$TAP2_NAME" ]; then
|
|||||||
echo "Bridge2: $BRIDGE2_NAME${BRIDGE2_CIDR:+ = $BRIDGE2_CIDR}"
|
echo "Bridge2: $BRIDGE2_NAME${BRIDGE2_CIDR:+ = $BRIDGE2_CIDR}"
|
||||||
echo "TAP2: $TAP2_NAME attached to $BRIDGE2_NAME"
|
echo "TAP2: $TAP2_NAME attached to $BRIDGE2_NAME"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
start_gui
|
|
||||||
Reference in New Issue
Block a user