lingyuzeng/edge-node
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加 NL 防止换行有问题

Browse Source
This commit is contained in:
lingyuzeng
2025-10-02 22:48:20 +08:00
parent 862b5676c1
commit 22b10cd112
2 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@@ -20,4 +20,4 @@ DEREG_AFTER=1m
# === Traefik 入口 & 证书解析器（与云端对应）=== # === Traefik 入口 & 证书解析器（与云端对应）===
TRAEFIK_HTTP_ENTRYPOINT=websecure TRAEFIK_HTTP_ENTRYPOINT=websecure
TRAEFIK_TCP_ENTRYPOINT=tcp TRAEFIK_TCP_ENTRYPOINT=tcp
TRAEFIK_CERT_RESOLVER=cf # 或 alidns TRAEFIK_CERT_RESOLVER=alidns # 或 alidns

43
registrar.sh
View File

@@ -29,27 +29,38 @@ done
ID="${SERVICE_NAME}-${SERVICE_ADDR}-${SERVICE_PORT}" ID="${SERVICE_NAME}-${SERVICE_ADDR}-${SERVICE_PORT}"
# 组装 Traefik tags（ConsulCatalog） # 组装 Traefik tags（按“行”累加，避免值中逗号被拆）
NL='
'
TAGS="traefik.enable=true" TAGS="traefik.enable=true"
if [ "$SERVICE_PROTOCOL" = "http" ]; then if [ "$SERVICE_PROTOCOL" = "http" ]; then
TAGS="$TAGS,traefik.http.routers.${SERVICE_NAME}.rule=Host(\`${ROUTE_HOST}\`)" TAGS="$TAGS${NL}traefik.http.routers.${SERVICE_NAME}.rule=Host(\`${ROUTE_HOST}\`)"
TAGS="$TAGS,traefik.http.routers.${SERVICE_NAME}.entrypoints=${TRAEFIK_HTTP_ENTRYPOINT}" TAGS="$TAGS${NL}traefik.http.routers.${SERVICE_NAME}.entrypoints=${TRAEFIK_HTTP_ENTRYPOINT}"
TAGS="$TAGS,traefik.http.routers.${SERVICE_NAME}.tls=true" TAGS="$TAGS${NL}traefik.http.routers.${SERVICE_NAME}.tls=true"
TAGS="$TAGS,traefik.http.services.${SERVICE_NAME}.loadbalancer.server.scheme=http" TAGS="$TAGS${NL}traefik.http.services.${SERVICE_NAME}.loadbalancer.server.scheme=http"
TAGS="$TAGS,traefik.http.services.${SERVICE_NAME}.loadbalancer.server.port=${SERVICE_PORT}" TAGS="$TAGS${NL}traefik.http.services.${SERVICE_NAME}.loadbalancer.server.port=${SERVICE_PORT}"
# 可选：应用云端 dynamic.yml 的中间件 # 抢占路由：给当前 Host 的 router 设置更高优先级
TAGS="$TAGS,traefik.http.routers.${SERVICE_NAME}.middlewares=gzip-all@file,security-headers@file" TAGS="$TAGS${NL}traefik.http.routers.${SERVICE_NAME}.priority=10000"
# 可选中间件（注意：值里有逗号也安全）
TAGS="$TAGS${NL}traefik.http.routers.${SERVICE_NAME}.middlewares=gzip-all@file,security-headers@file"
# 如需 ACME 证书解析器可再加一行（取消注释）
# TAGS="$TAGS${NL}traefik.http.routers.${SERVICE_NAME}.tls.certresolver=${TRAEFIK_CERT_RESOLVER}"
elif [ "$SERVICE_PROTOCOL" = "tcp" ]; then elif [ "$SERVICE_PROTOCOL" = "tcp" ]; then
TAGS="$TAGS,traefik.tcp.routers.${SERVICE_NAME}.rule=HostSNI(\`${ROUTE_HOST}\`)" TAGS="$TAGS${NL}traefik.tcp.routers.${SERVICE_NAME}.rule=HostSNI(\`${ROUTE_HOST}\`)"
TAGS="$TAGS,traefik.tcp.routers.${SERVICE_NAME}.entrypoints=${TRAEFIK_TCP_ENTRYPOINT}" TAGS="$TAGS${NL}traefik.tcp.routers.${SERVICE_NAME}.entrypoints=${TRAEFIK_TCP_ENTRYPOINT}"
TAGS="$TAGS,traefik.tcp.services.${SERVICE_NAME}.loadbalancer.server.port=${SERVICE_PORT}" TAGS="$TAGS${NL}traefik.tcp.services.${SERVICE_NAME}.loadbalancer.server.port=${SERVICE_PORT}"
else else
echo "unsupported SERVICE_PROTOCOL=$SERVICE_PROTOCOL" >&2; exit 2 echo "unsupported SERVICE_PROTOCOL=$SERVICE_PROTOCOL" >&2; exit 2
fi fi
# 转 JSON 数组（按逗号拆分） # 转 JSON 数组（按“行”解析）
to_json_array() { echo "$1" | awk -v RS=, 'NF{print "\""$0"\""}' | paste -sd, - | sed 's/^/[/' | sed 's/$/]/'; } to_json_array() {
TAGS_JSON="$(to_json_array "$TAGS")" # 逐行 -> trim -> "..." -> [ ... ]
awk 'BEGIN{RS="\n"} NF {gsub(/^[ \t]+|[ \t]+$/,""); printf "\"%s\",\n",$0}' |
sed '1s/^/[/' | sed '$s/,\s*$/]/'
}
TAGS_JSON="$(printf "%s" "$TAGS" | to_json_array)"
# 健康检查 JSON # 健康检查 JSON
if [ "$CHECK_TYPE" = "http" ]; then if [ "$CHECK_TYPE" = "http" ]; then
@@ -64,12 +75,12 @@ EOF
) )
fi fi
# 写 service 定义并注册到"云端" Consul Server # 写 service 定义并注册到云端 Consul
cat > /tmp/svc.json <<EOF cat > /tmp/svc.json <<EOF
{"service":{"id":"${ID}","name":"${SERVICE_NAME}","address":"${SERVICE_ADDR}","port":${SERVICE_PORT},"tags":${TAGS_JSON},"checks":[${CHECK_JSON}]}} {"service":{"id":"${ID}","name":"${SERVICE_NAME}","address":"${SERVICE_ADDR}","port":${SERVICE_PORT},"tags":${TAGS_JSON},"checks":[${CHECK_JSON}]}}
EOF EOF
echo "[registrar] register ${ID} -\u003e ${CONSUL}" echo "[registrar] register ${ID} -> ${CONSUL}"
consul services register -http-addr="$CONSUL" /tmp/svc.json consul services register -http-addr="$CONSUL" /tmp/svc.json
term() { term() {