svefnz/sing-box
1
0
Fork 0
Code Issues Pull Requests Actions 29 Packages Projects Releases Wiki Activity

fix: make Caddyfile global config update robust to avoid IPv6 conflicts
Main / build (push) Waiting to run
Details

Browse Source
This commit is contained in:
朝代尾
2026-07-08 12:54:48 +08:00
parent f07100c074
commit f05e5e0410
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core.sh
+8 -5
View File
@@ -159,15 +159,18 @@ update_caddyfile_fallback() {
sed -i 's/servers :443/servers :4443/g' $is_caddyfile sed -i 's/servers :443/servers :4443/g' $is_caddyfile
# 2. Replace any site block headers explicit :443 with :4443 # 2. Replace any site block headers explicit :443 with :4443
sed -i 's/:443[[:space:]]*{/:4443 {/g' $is_caddyfile sed -i 's/:443\b/:4443/g' $is_caddyfile
# 3. Add or update https_port 4443 in global block # 3. Add or update https_port 4443 globally
if [[ $(grep "https_port" $is_caddyfile) ]]; then if grep -q "https_port" $is_caddyfile; then
# Replace existing https_port with 4443 # Replace existing https_port with 4443
sed -i 's/https_port[[:space:]]\+[0-9]\+/https_port 4443/g' $is_caddyfile sed -i 's/https_port[[:space:]]\+[0-9]\+/https_port 4443/g' $is_caddyfile
else elif grep -q '^[[:space:]]*{[[:space:]]*$' $is_caddyfile; then
# Find first { and insert https_port 4443 on the next line # Insert inside existing global block
sed -i '0,/^[[:space:]]*{[[:space:]]*$/s//{\n https_port 4443/' $is_caddyfile sed -i '0,/^[[:space:]]*{[[:space:]]*$/s//{\n https_port 4443/' $is_caddyfile
else
# Prepend a new global block at the very top of the Caddyfile
echo -e "{\n https_port 4443\n}\n$(cat $is_caddyfile)" >$is_caddyfile
fi fi
} }