ai-workspace-infra/observability.svc.plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: resolve port 443 conflict and set Caddy as default ingress in server-install.sh

Browse Source
This commit is contained in:
Haitao Pan 2026-02-04 15:44:02 +08:00
parent b4d011ca4e
commit fef631a332
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/server-install.sh
View File

@ -135,7 +135,22 @@ run_configure() {
./configure -n -i 127.0.0.1
fi
if [[ -f "pigsty.yml" ]]; then
log_info "Tuning pigsty.yml: setting 127.0.0.1 and enabling Caddy..."
sed -i 's/10\.146\.0\.6/127.0.0.1/g' pigsty.yml
# Ensure Nginx is disabled and Caddy is enabled in global vars
# We look for the 'vars:' section under 'all:'
if grep -q "nginx_enabled:" pigsty.yml; then
sed -i 's/nginx_enabled: .*/nginx_enabled: false/' pigsty.yml
else
sed -i '/vars:/a \ nginx_enabled: false' pigsty.yml
fi
if grep -q "caddy_enabled:" pigsty.yml; then
sed -i 's/caddy_enabled: .*/caddy_enabled: true/' pigsty.yml
else
sed -i '/vars:/a \ caddy_enabled: true' pigsty.yml
fi
fi
}
@ -238,6 +253,12 @@ uninstall_stack() {
}
deploy_or_upgrade() {
log_info "Cleaning up potential port conflicts (80/443)..."
if command -v fuser >/dev/null 2>&1; then
fuser -k 80/tcp 443/tcp || true
fi
systemctl stop nginx apache2 caddy 2>/dev/null || true
ensure_repo
ensure_root_ssh_access
run_bootstrap