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

Jump to bottom

Added special case support for caddyfile suffix, case insensitive #5919

Merged
merged 7 commits into from
Apr 11, 2024
Merged

Added special case support for caddyfile suffix, case insensitive #5919

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4416ef3
added special case support for caddyfile suffix, case insensitive
omalk98 Oct 27, 2023
d0acac4
Merge branch 'master' into issue-5909
omalk98 Nov 9, 2023
30c9d5b
Merge branch 'master' into issue-5909
omalk98 Nov 15, 2023
3dc306d
Merge branch 'caddyserver:master' into issue-5909
omalk98 Dec 14, 2023
fab8fba
Update cmd/main.go
omalk98 Dec 14, 2023
942e78d
skip caddyfile adapter for registered file extensions
omalk98 Dec 14, 2023
2fcbb80
Merge branch 'master' into issue-5909
mholt Mar 7, 2024
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
15 changes: 10 additions & 5 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,16 @@ func loadConfigWithLogger(logger *zap.Logger, configFile, adapterName string) ([
}
}

// as a special case, if a config file called "Caddyfile" was
// specified, and no adapter is specified, assume caddyfile adapter
// for convenience
if strings.HasPrefix(filepath.Base(configFile), "Caddyfile") &&
filepath.Ext(configFile) != ".json" &&
// as a special case, if a config file starts with "caddyfile" or
// has a ".caddyfile" extension, and no adapter is specified, and
// no adapter module name matches the extension, assume
// caddyfile adapter for convenience
baseConfig := strings.ToLower(filepath.Base(configFile))
baseConfigExt := filepath.Ext(baseConfig)
if (strings.HasPrefix(baseConfig, "caddyfile") ||
strings.HasSuffix(baseConfig, ".caddyfile")) &&
caddyconfig.GetAdapter(baseConfigExt[1:]) == nil &&
baseConfigExt != ".json" &&
adapterName == "" {
adapterName = "caddyfile"
}
Expand Down
Loading