Skip to content

Commit 00dddab

Browse files
committed
MINOR: add acls, http-request, http-response, http-after-response, tcp-request to defaults
Now that we have only named defaults, we can add all those to defaults
1 parent 14be787 commit 00dddab

File tree

7 files changed

+4211
-1074
lines changed

7 files changed

+4211
-1074
lines changed

parsers/tcp/tcp-request.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525

2626
type Requests struct {
2727
Name string
28-
Mode string // frontent, backend, listen
28+
Mode string // frontent, backend, listen, defaults
2929
data []types.TCPType
3030
preComments []string // comments that appear before the actual line
3131
}

section-parsers.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ func (p *configParser) getDefaultParser() *Parsers {
8181
addParser(parser, &sequence, &parsers.Balance{})
8282
addParser(parser, &sequence, &parsers.MaxConn{})
8383
addParser(parser, &sequence, &simple.Number{Name: "backlog"})
84+
addParser(parser, &sequence, &parsers.ACL{})
8485
addParser(parser, &sequence, &parsers.Log{})
8586
addParser(parser, &sequence, &parsers.OptionHTTPLog{})
8687
addParser(parser, &sequence, &parsers.EmailAlert{})
@@ -200,6 +201,10 @@ func (p *configParser) getDefaultParser() *Parsers {
200201
addParser(parser, &sequence, &parsers.Persist{})
201202
addParser(parser, &sequence, &simple.Number{Name: "rate-limit sessions"})
202203
addParser(parser, &sequence, &simple.Number{Name: "hash-balance-factor"})
204+
addParser(parser, &sequence, &http.Requests{Mode: "defaults"})
205+
addParser(parser, &sequence, &tcp.Requests{Mode: "defaults"})
206+
addParser(parser, &sequence, &http.Responses{Mode: "defaults"})
207+
addParser(parser, &sequence, &http.AfterResponses{})
203208
// the ConfigSnippet must be at the end to parsers load order to ensure
204209
// the overloading of any option has been declared previously
205210
addParser(parser, &sequence, &parsers.ConfigSnippet{})
@@ -493,7 +498,7 @@ func (p *configParser) getFrontendParser() *Parsers {
493498
addParser(parser, &sequence, &parsers.CompressionTypeReq{})
494499
addParser(parser, &sequence, &parsers.CompressionTypeRes{})
495500
addParser(parser, &sequence, &parsers.CompressionOffload{})
496-
addParser(parser, &sequence, &tcp.Requests{})
501+
addParser(parser, &sequence, &tcp.Requests{Mode: "frontend"})
497502
addParser(parser, &sequence, &stats.Stats{Mode: "frontend"})
498503
addParser(parser, &sequence, &http.Requests{Mode: "frontend"})
499504
addParser(parser, &sequence, &http.Redirect{})
@@ -750,7 +755,7 @@ func (p *configParser) getListenParser() *Parsers {
750755
addParser(parser, &sequence, &parsers.CompressionTypeRes{})
751756
addParser(parser, &sequence, &parsers.CompressionOffload{})
752757
addParser(parser, &sequence, &parsers.CompressionDirection{})
753-
addParser(parser, &sequence, &tcp.Requests{})
758+
addParser(parser, &sequence, &tcp.Requests{Mode: "listen"})
754759
addParser(parser, &sequence, &stats.Stats{Mode: "listen"})
755760
addParser(parser, &sequence, &parsers.HTTPReuse{})
756761
addParser(parser, &sequence, &http.Requests{Mode: "listen"})

0 commit comments

Comments
 (0)