bingshuo
/
zhizhi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 改进冲突检测逻辑 — 排除注释行+iptables去重 

Agent-Logs-Url: https://github.com/qinfendebingshuo/guanghulab/sessions/cf7e00b0-8d2a-46c5-ae90-6b90088b3942

Co-authored-by: qinfendebingshuo <207279273+qinfendebingshuo@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2026-04-12 01:37:08 +00:00 committed by GitHub
parent 30cabe2773
commit e1c15e938a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.github/workflows/deploy-ali-cn-landing.yml vendored
View File

@ -194,14 +194,18 @@ jobs:
echo " ✅ firewalld 规则已重载"
elif command -v iptables &> /dev/null; then
echo "🔥 检测到 iptables"
# 检查是否有DROP规则阻止80/443
if iptables -L INPUT -n 2>/dev/null | grep -q "DROP.*dpt:80"; then
# 检查并添加ACCEPT规则（先用-C检测是否已存在，避免重复）
if ! iptables -C INPUT -p tcp --dport 80 -j ACCEPT 2>/dev/null; then
iptables -I INPUT -p tcp --dport 80 -j ACCEPT
echo " ✅ 已添加 iptables 规则: 允许端口 80"
else
echo " ✅ 端口 80 ACCEPT 规则已存在"
fi
if iptables -L INPUT -n 2>/dev/null | grep -q "DROP.*dpt:443"; then
if ! iptables -C INPUT -p tcp --dport 443 -j ACCEPT 2>/dev/null; then
iptables -I INPUT -p tcp --dport 443 -j ACCEPT
echo " ✅ 已添加 iptables 规则: 允许端口 443"
else
echo " ✅ 端口 443 ACCEPT 规则已存在"
fi
echo " ✅ iptables 检查完成"
else
@ -318,9 +322,10 @@ jobs:
if [ "$BASENAME" = "guanghulab-landing.conf" ]; then
continue
fi
# 检查是否包含 guanghulab 相关的 server_name 或 default_server
if grep -qE "(server_name.*guanghulab|default_server)" "$conf" 2>/dev/null; then
echo " ⚠️ 冲突配置: $BASENAME"
# 检查是否包含未注释的 guanghulab 相关 server_name 或 default_server
# 排除注释行（以 # 开头），只匹配真正的指令
if grep -vE '^\s*#' "$conf" 2>/dev/null | grep -qE "server_name.*guanghulab"; then
echo " ⚠️ 冲突配置: $BASENAME (server_name包含guanghulab)"
echo " → 备份到: ${conf}.disabled.by-landing"
cp "$conf" "${conf}.disabled.by-landing"
mv "$conf" "${conf%.conf}.conf.disabled"
@ -339,7 +344,7 @@ jobs:
# 检查链接目标或文件内容
REAL_FILE="$conf"
[ -L "$conf" ] && REAL_FILE=$(readlink -f "$conf")
if [ -f "$REAL_FILE" ] && grep -qE "(server_name.*guanghulab|default_server)" "$REAL_FILE" 2>/dev/null; then
if [ -f "$REAL_FILE" ] && grep -vE '^\s*#' "$REAL_FILE" 2>/dev/null | grep -qE "server_name.*guanghulab"; then
echo " ⚠️ 冲突配置(sites-enabled): $BASENAME"
echo " → 移除符号链接: $conf"
rm -f "$conf"