diff --git a/cmd/yukari/main.go b/cmd/yukari/main.go index 5b945a0..46fff3e 100644 --- a/cmd/yukari/main.go +++ b/cmd/yukari/main.go @@ -902,6 +902,17 @@ func (p *Proxy) serveMainPage(ctx *fasthttp.RequestCtx, statusCode int, err erro } func main() { + config.Config.ListenAddress = "127.0.0.1:3000" + config.Config.Key = "" + config.Config.IPV6 = true + config.Config.Debug = false + config.Config.RequestTimeout = 5 + config.Config.FollowRedirect = false + config.Config.UrlParameter = "yukariurl" + config.Config.HashParameter = "yukarihash" + config.Config.MaxConnsPerHost = 5 + config.Config.ProxyEnv = false + var configFile string var proxy string var socks5 string @@ -915,17 +926,6 @@ func main() { if configFile != "" { config.ReadConfig(configFile) - } else { - config.Config.ListenAddress = "127.0.0.1:3000" - config.Config.Key = "" - config.Config.IPV6 = true - config.Config.Debug = false - config.Config.RequestTimeout = 5 - config.Config.FollowRedirect = false - config.Config.UrlParameter = "yukariurl" - config.Config.HashParameter = "yukarihash" - config.Config.MaxConnsPerHost = 5 - config.Config.ProxyEnv = false } if version { diff --git a/yukari.ini.5 b/yukari.ini.5 index e1213b4..2b13013 100644 --- a/yukari.ini.5 +++ b/yukari.ini.5 @@ -29,7 +29,7 @@ User-defined requesting string URL parameter name .It hashparam (string) User-defined requesting string HASH parameter name (ie: '/?hash=...' or '/?h=...') (default "yukarihash") -.It proxyenv (string) +.It proxyenv (bool) Use a HTTP proxy as set in the environment ( .Ev HTTP_PROXY ,