serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-27 06:03:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

httpcaddyfile: Minor fixes to parsing storage options

Browse source
This commit is contained in:
Matthew Holt 2020-05-01 09:34:32 -06:00
parent 1fa8c185a8
commit bca610fbde
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
2 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
caddyconfig/httpcaddyfile/options.go
View file

@ -136,14 +136,13 @@ func parseOptOrder(d *caddyfile.Dispenser) ([]string, error) {
} }
func parseOptStorage(d *caddyfile.Dispenser) (caddy.StorageConverter, error) { func parseOptStorage(d *caddyfile.Dispenser) (caddy.StorageConverter, error) {
if !d.Next() { if !d.Next() { // consume option name
return nil, d.ArgErr() return nil, d.ArgErr()
} }
args := d.RemainingArgs() if !d.Next() { // get storage module name
if len(args) != 1 {
return nil, d.ArgErr() return nil, d.ArgErr()
} }
modName := args[0] modName := d.Val()
mod, err := caddy.GetModule("caddy.storage." + modName) mod, err := caddy.GetModule("caddy.storage." + modName)
if err != nil { if err != nil {
return nil, d.Errf("getting storage module '%s': %v", modName, err) return nil, d.Errf("getting storage module '%s': %v", modName, err)

29
modules/filestorage/filestorage.go
View file

@ -48,15 +48,32 @@ func (s *FileStorage) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
if !d.Next() { if !d.Next() {
return d.Err("expected tokens") return d.Err("expected tokens")
} }
for nesting := d.Nesting(); d.NextBlock(nesting); { if d.NextArg() {
if !d.NextArg() {
return d.ArgErr()
}
s.Root = d.Val() s.Root = d.Val()
if d.NextArg() { }
return d.ArgErr() if d.NextArg() {
return d.ArgErr()
}
for nesting := d.Nesting(); d.NextBlock(nesting); {
switch d.Val() {
case "root":
if !d.NextArg() {
return d.ArgErr()
}
if s.Root != "" {
return d.Err("root already set")
}
s.Root = d.Val()
if d.NextArg() {
return d.ArgErr()
}
default:
return d.Errf("unrecognized parameter '%s'", d.Val())
} }
} }
if s.Root == "" {
return d.Err("missing root path (to use default, omit storage config entirely)")
}
return nil return nil
} }