github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-26 02:09:47 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Removed the Windows part. It wasn't working properly.

Browse Source 
For issue #304.
This commit is contained in:
Michael Banzon 2015-11-05 18:12:06 +01:00
parent 01465932e7
commit 8774c90709
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
caddy/parse/parsing.go
View File

@ -9,8 +9,7 @@ import (
) )
var ( var (
unixEnvRegEx = regexp.MustCompile("{\\$[^}]+}") envRegEx = regexp.MustCompile("{\\$[^}]+}")
windowsEnvRegEx = regexp.MustCompile("{%[^}]+%}")
) )
type parser struct { type parser struct {
@ -338,18 +337,11 @@ func (sb serverBlock) HostList() []string {
} }
func getValFromEnv(s string) string { func getValFromEnv(s string) string {
envRefsUnix := unixEnvRegEx.FindAllString(s, -1) envRefs := envRegEx.FindAllString(s, -1)
for _, ref := range envRefsUnix { for _, ref := range envRefs {
s = strings.Replace(s, ref, os.Getenv(ref[2:len(ref)-1]), -1) s = strings.Replace(s, ref, os.Getenv(ref[2:len(ref)-1]), -1)
} }
envRefsWin := unixEnvRegEx.FindAllString(s, -1)
for _, ref := range envRefsWin {
s = strings.Replace(s, ref, os.Getenv(ref[2:len(ref)-2]), -1)
}
return s return s
} }