Skip to content
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

cmd: Require config file exists for caddy validate #5614

Merged
merged 10 commits into from
Aug 9, 2023
Merged

cmd: Require config file exists for caddy validate #5614

Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
607bef2
Require config for caddy validate - fixes #5612
pistasjis Jul 2, 2023
56758ef
Merge branch 'master' into validate-require-config
pistasjis Jul 2, 2023
db59ef3
Try making adjacent Caddyfile check its own function
pistasjis Jul 10, 2023
76dd631
Merge branch 'validate-require-config' of https://github.com/pistasji…
pistasjis Jul 10, 2023
ba4962b
add Francis' suggestion
pistasjis Aug 7, 2023
ddb3ecc
Refactor
mholt Aug 7, 2023
38aa264
Fix borked commit, sigh
mholt Aug 7, 2023
3076886
Merge branch 'master' into validate-require-config
mholt Aug 9, 2023
fe712df
Merge branch 'master' into validate-require-config
mholt Aug 9, 2023
20c0de6
Merge branch 'master' into validate-require-config
mholt Aug 9, 2023
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
20 changes: 20 additions & 0 deletions cmd/commandfuncs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,26 @@ func cmdValidateConfig(fl Flags) (int, error) {
}
}

// if no input file was specified, try a default
// Caddyfile if the Caddyfile adapter is plugged in
if validateCmdConfigFlag == "" && caddyconfig.GetAdapter("caddyfile") != nil {
_, err := os.Stat("Caddyfile")
if err == nil {
// default Caddyfile exists
validateCmdConfigFlag = "Caddyfile"
validateCmdAdapterFlag = "caddyfile"
caddy.Log().Info("using adjacent Caddyfile")
} else if !os.IsNotExist(err) {
// default Caddyfile exists, but error accessing it
return caddy.ExitCodeFailedStartup, fmt.Errorf("accessing default Caddyfile: %v", err)
}
}

if validateCmdConfigFlag == "" {
return caddy.ExitCodeFailedStartup,
fmt.Errorf("input file required when there is no Caddyfile in current directory (use --config flag)")
}

input, _, err := LoadConfig(validateCmdConfigFlag, validateCmdAdapterFlag)
if err != nil {
return caddy.ExitCodeFailedStartup, err
Expand Down