github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-22 08:57:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmd: Assume Caddyfile if name starts with Caddyfile

Browse Source 
And doesn't have .json extension -- in case someone names their
JSON config something like Caddyfile.json, which is unconventional.
This commit is contained in:
Matthew Holt 2020-01-11 13:48:29 -07:00
parent 25dea2903e
commit 8c0c1a7b88
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/main.go
View File

@ -137,7 +137,9 @@ func loadConfig(configFile, adapterName string) ([]byte, error) {
// as a special case, if a config file called "Caddyfile" was
// specified, and no adapter is specified, assume caddyfile adapter
// for convenience
if filepath.Base(configFile) == "Caddyfile" && adapterName == "" {
if strings.HasPrefix(filepath.Base(configFile), "Caddyfile") &&
filepath.Ext(configFile) != ".json" &&
adapterName == "" {
adapterName = "caddyfile"
}