github/fscarmen-sing-box
1
0
Fork 0
mirror of https://github.com/fscarmen/sing-box.git synced 2026-08-10 17:55:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix a bug in Json and Token Tunnels.

Browse Source
This commit is contained in:
fscarmen
2024-04-04 15:26:05 +00:00
parent 23743ae6a5
commit 53065a4e83
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+3 -3
View File
@@ -164,7 +164,7 @@ bash <(wget -qO- https://raw.githubusercontent.com/fscarmen/sing-box/main/sing-b
``` ```
docker run -dit \ docker run -dit \
--pull always \ --pull always \
--name sing-box --name sing-box \
-p 8800-8820:8800-8820/tcp \ -p 8800-8820:8800-8820/tcp \
-p 8800-8820:8800-8820/udp \ -p 8800-8820:8800-8820/udp \
-e START_PORT=8800 \ -e START_PORT=8800 \
@@ -203,8 +203,8 @@ services:
networks: networks:
- sing-box - sing-box
ports: ports:
- "8000-8020:8800-8820/tcp" - "8800-8820:8800-8820/tcp"
- "8000-8020:8800-8820/udp" - "8800-8820:8800-8820/udp"
environment: environment:
- START_PORT=8800 - START_PORT=8800
- SERVER_IP=123.123.123.123 - SERVER_IP=123.123.123.123
docker_init.sh
+8 -5
View File
@@ -132,7 +132,7 @@ EOF
} }
EOF EOF
# 生成 route 配置 # 生成 route 配置
cat > $WORK_DIR/conf/02_route.json << EOF cat > $WORK_DIR/conf/02_route.json << EOF
{ {
"route":{ "route":{
@@ -295,7 +295,7 @@ EOF
} }
EOF EOF
# 生成 ShadowTLS V5 配置 # 生成 ShadowTLS V5 配置
[ "${SHADOWTLS}" = 'true' ] && ((PORT++)) && PORT_SHADOWTLS=$PORT && cat > $WORK_DIR/conf/14_ShadowTLS_inbounds.json << EOF [ "${SHADOWTLS}" = 'true' ] && ((PORT++)) && PORT_SHADOWTLS=$PORT && cat > $WORK_DIR/conf/14_ShadowTLS_inbounds.json << EOF
{ {
"inbounds":[ "inbounds":[
@@ -442,7 +442,7 @@ EOF
} }
EOF EOF
# 生成 vless + ws + tls 配置 # 生成 vless + ws + tls 配置
[ "${VLESS_WS}" = 'true' ] && ((PORT++)) && PORT_VLESS_WS=$PORT && cat > $WORK_DIR/conf/18_vless-ws-tls_inbounds.json << EOF [ "${VLESS_WS}" = 'true' ] && ((PORT++)) && PORT_VLESS_WS=$PORT && cat > $WORK_DIR/conf/18_vless-ws-tls_inbounds.json << EOF
// "CDN": "${CDN}" // "CDN": "${CDN}"
{ {
@@ -643,8 +643,11 @@ stdout_logfile=/dev/null
echo "$SUPERVISORD_CONF" > /etc/supervisor.d/daemon.ini echo "$SUPERVISORD_CONF" > /etc/supervisor.d/daemon.ini
# 如使用临时隧道，先运行 cloudflared 以获取临时隧道域名 # 如使用临时隧道，先运行 cloudflared 以获取临时隧道域名
$WORK_DIR/$ARGO_RUNS >/dev/null 2>&1 & if [ -n "$METRICS_PORT" ]; then
[ -n "$METRICS_PORT" ] && sleep 3 && ARGO_DOMAIN=$(wget -qO- http://localhost:$METRICS_PORT/quicktunnel | awk -F '"' '{print $4}') $WORK_DIR/$ARGO_RUNS >/dev/null 2>&1 &
sleep 3
local ARGO_DOMAIN=$(wget -qO- http://localhost:$METRICS_PORT/quicktunnel | awk -F '"' '{print $4}')
fi
# 生成 nginx 配置文件 # 生成 nginx 配置文件
local NGINX_CONF="user root; local NGINX_CONF="user root;