Move local admin server replacement logic below data structure initia…#7004
Merged
mholt merged 1 commit intocaddyserver:masterfrom May 8, 2025
Merged
Conversation
…lizations in provisionContext()
mholt
approved these changes
May 8, 2025
Member
mholt
left a comment
mholt
left a comment
There was a problem hiding this comment.
Ah thank you!
I think this should be alright, we will give it a shot and hopefully patch it up before any other releases if needed :) Thanks again!
1 task
mohammed90
pushed a commit
to cedricziel/caddy
that referenced
this pull request
Aug 29, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
…lizations in provisionContext()
Fixes #7001
Background
When Caddy starts,
provisionContextcallsreplaceLocalAdminServerwhich callsprovisionAdminRouters. Changes introduced in #6997 to make sure that module state is accurately reconstructed across module (re)loads makes the assumption that the config.apps member exists at the time the provisioner is called.However in modules like
caddypki/adminapi.go, the provisioner tries to access thepkiapp, which in many situations does have a configuration entry, which triggers the module loader. The module loader (LoadModuleByID()) then fails to assign the app toctx.cfg.appsbecause it hasn't been initialized yet.Solution proposed in this PR
This modification moves the local admin server replacement to the end of the context provisioning phase, which ensures that the
Config.appsmap is initialized, so that the module loader (which can be called from various provisioners viaAppIfConfigured()) can work correctly.