add subdomain configuration; add conn auth timeout

This commit is contained in:
Maodanping
2016-11-05 14:15:16 +08:00
parent 4c69a4810e
commit 396e148f80
9 changed files with 45 additions and 4 deletions

View File

@@ -166,6 +166,11 @@ func LoadConf(confFile string) (err error) {
if ok {
proxyClient.HttpPassWord = tmpStr
}
// subdomain
tmpStr, ok = section["subdomain"]
if ok {
proxyClient.SubDomain = tmpStr
}
}
// privilege_mode
@@ -219,6 +224,9 @@ func LoadConf(confFile string) (err error) {
} else {
return fmt.Errorf("Parse conf error: proxy [%s] custom_domains must be set when type equals http", proxyClient.Name)
}
// subdomain
proxyClient.SubDomain, ok = section["subdomain"]
} else if proxyClient.Type == "https" {
// custom_domains
domainStr, ok := section["custom_domains"]