Skip to content

fix(deploy): default_server scan only counts *.conf files (D-1146; D-0133, D-0111 not changed) #942

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
acamarata merged 1 commit into from
Oct 25, 2026
Merged

fix(deploy): default_server scan only counts *.conf files (D-1146; D-0133, D-0111 not changed) #942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions internal/deploy/remote_backup_confd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,8 @@ func TestKeptHostConfDDefaultServerCollision(t *testing.T) {
"conf.d sibling": {"nginx/conf.d/other.conf", "server {\n listen [::]:80 default_server;\n}\n", "", "nginx/conf.d/other.conf", true},
"commented out": {"nginx/sites/other.conf", "# listen 80 default_server;\nserver { listen 80; }\n", "", "", false},
"no default_server": {"nginx/sites/other.conf", "server { listen 80; }\n", "", "", false},
"backup file": {"nginx/conf.d/default.conf.bak", "server { listen 80 default_server; }\n", "", "", false},
"sites backup file": {"nginx/sites/other.conf.orig", "server { listen 80 default_server; }\n", "", "", false},
"word only": {"nginx/sites/other.conf", "server { server_name default_server; }\n", "", "", false},
"ours exists, marked": {"nginx/sites/other.conf", "server { listen 80 default_server; }\n", buildMarker, "", false},
"ours exists, hand": {"nginx/sites/other.conf", "server { listen 80 default_server; }\n", "# hand\n", "", true},
Expand Down
5 changes: 3 additions & 2 deletions internal/deploy/remote_layout.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,8 @@ type KeptConfD struct {
// deploy must not ship (D-0424): the path exists as a regular file with no line
// in its first 5 starting with BuildNginxMarker, or is a symlink or anything that
// is not a regular file. Also, when nginx/conf.d/default.conf is absent on the
// host and any other regular file under nginx/conf.d*/ or nginx/sites/ has a
// host and any other regular *.conf file (the only names nginx.conf.tmpl includes,
// so default.conf.bak does not count) under nginx/conf.d*/ or nginx/sites/ has a
// listen line with default_server, our default.conf is kept out (reason
// DefaultServerIn), since two default servers fail nginx -t. The previous
// deploy's record and the host's shipped list are ignored for conf.d: the host
Expand Down Expand Up @@ -217,7 +218,7 @@ for f in %s; do
if [ -L "$f" ]; then printf 'KEEP %%s\n' "$f"
elif [ -f "$f" ]; then if ! head -n 5 -- "$f" 2>/dev/null | grep -q %s; then printf 'KEEP %%s\n' "$f"; fi
elif [ -e "$f" ]; then printf 'KEEP %%s\n' "$f"
elif [ "$f" = %s ]; then for g in nginx/conf.d*/* nginx/sites/*; do if [ -f "$g" ] && grep -Eq '(^|[{;])[[:space:]]*listen[[:space:]][^#;]*default_server' -- "$g" 2>/dev/null; then printf 'DSRV %%s\t%%s\n' "$f" "$(san "$g")"; break; fi; done
elif [ "$f" = %s ]; then for g in nginx/conf.d*/*.conf nginx/sites/*.conf; do if [ -f "$g" ] && grep -Eq '(^|[{;])[[:space:]]*listen[[:space:]][^#;]*default_server' -- "$g" 2>/dev/null; then printf 'DSRV %%s\t%%s\n' "$f" "$(san "$g")"; break; fi; done
fi
done; exit 0`, q(remotePath), strings.Join(quoteAll(cand), " "), q("^"+strings.ReplaceAll(BuildNginxMarker, " ", "[ ]")), q(defaultServerConf))
out, err := r.Run(ctx, shScript(script))
Expand Down
Loading