mirrors/nginx-ui
1
0
Fork 0
mirror of https://github.com/0xJacky/nginx-ui.git synced 2025-05-13 03:15:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Added build nginx config from json

Browse source
This commit is contained in:
0xJacky 2022-07-27 19:57:33 +08:00
parent 6f42852ca3
commit 32153a9b00
8 changed files with 347 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

33
server/tool/nginx/parse.go
View file

@ -15,6 +15,7 @@ const (
Upstream = "upstream"
CommentStart = "#"
Empty = ""
If = "if"
)
func matchParentheses(stack *linkedliststack.Stack, v int32) {
@ -44,20 +45,25 @@ func parseDirective(scanner *bufio.Scanner) (d NgxDirective) {
return
}
sep := len(text) - 1
for k, v := range text {
if unicode.IsSpace(v) {
sep = k
break
if len(text) > 1 {
sep := len(text) - 1
for k, v := range text {
if unicode.IsSpace(v) {
sep = k
break
}
}
}
d.Directive = text[0:sep]
d.Params = text[sep:]
d.Directive = text[0:sep]
d.Params = text[sep:]
} else {
d.Directive = text
return
}
stack := linkedliststack.New()
if d.Directive == Server || d.Directive == Upstream || d.Directive == Location {
if d.Directive == Server || d.Directive == Upstream || d.Directive == Location || d.Directive == If {
// { } in one line
// location = /.well-known/carddav { return 301 /remote.php/dav/; }
if strings.Contains(d.Params, "{") {
@ -118,6 +124,10 @@ func ParseNgxConfig(filename string) (c *NgxConfig, err error) {
c.parseUpstream(paramsScanner)
case CommentStart:
c.commentQueue.Enqueue(d.Params)
case Empty:
continue
default:
c.Custom += d.Orig() + "\n"
}
}
@ -125,5 +135,10 @@ func ParseNgxConfig(filename string) (c *NgxConfig, err error) {
return nil, errors.Wrap(err, "error scanner in ParseNgxConfig")
}
// Attach the rest of the comments to the last server
if len(c.Servers) > 0 {
c.Servers[len(c.Servers)-1].Comments += c.commentQueue.DequeueAllComments()
}
return c, nil
}