Skip to content

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

Merged
acamarata merged 1 commit into
mainfrom
dw1-cli-6
Oct 25, 2026
Merged

acamarata merged 1 commit into
mainfrom
dw1-cli-6

Conversation

@acamarata

Copy link
Copy Markdown
Collaborator

D-1146 — fixed

KeptHostConfD scanned nginx/conf.d*/* nginx/sites/* for default_server, so a backup such as default.conf.bak (never loaded by nginx; nginx.conf.tmpl includes only *.conf) kept our generated default.conf off the host. The glob is now nginx/conf.d*/*.conf nginx/sites/*.conf.

Test: two new cases in TestKeptHostConfDDefaultServerCollision (default.conf.bak, sites/other.conf.orig). Both failed before the fix, pass after.

D-0133 — not changed (BLOCKED)

Still applies on origin/main: the functions commands (cmd/commands/functions*.go) and the compose wiring (internal/compose/core_services.go) are both still in core. The resolution moves the service into the plugin (ADR 0028 pattern), which is plugin-repo work owned by P7-PLUG, not a local fix.

D-0111 — not changed (BLOCKED)

Still applies: internal/embedded/ and cmd/commands/start_embedded_cgo.go exist, issue #231 is open. The row asks for a product decision (finish dynamic linking behind an experimental flag, or remove the package and start hook); that is not mine to make.

Commands run

  • go build ./... ok
  • go vet ./internal/deploy ok; gofmt -l internal/deploy empty
  • go test ./internal/deploy: 322 passed
  • new cases confirmed failing before the fix (3 failed incl. parent), passing after

…des (D-1146)

default.conf.bak and other non-.conf files under nginx/conf.d*/ and
nginx/sites/ are never loaded by nginx (nginx.conf.tmpl includes only
*.conf), so they no longer keep the generated default.conf off the host.
@acamarata
acamarata merged commit 49b1f24 into main Oct 25, 2026
36 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant