From 8e3a5cc5e5a1138a0a3b66e0f215c279e4c94802 Mon Sep 17 00:00:00 2001
From: "yakumo.izuru" <yakumo.izuru@f3bd38d9-da89-464d-a02a-eb04e43141b5>
Date: Tue, 26 Mar 2024 17:38:17 +0000
Subject: [PATCH] =?UTF-8?q?=E3=81=93=E3=81=AE=E3=82=88=E3=81=86=E3=81=AA?=
 =?UTF-8?q?=E3=81=93=E3=81=A8=E3=81=8C=E5=8E=9F=E5=9B=A0=E3=81=A7=E3=83=97?=
 =?UTF-8?q?=E3=83=AD=E3=82=B0=E3=83=A9=E3=83=A0=E3=81=8C=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=8F=E3=81=AA=E3=82=8B=E3=81=A8?=
 =?UTF-8?q?=E3=81=AF=E7=9F=A5=E3=82=8A=E3=81=BE=E3=81=9B=E3=82=93=E3=81=A7?=
 =?UTF-8?q?=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Izuru Yakumo <yakumo.izuru@chaotic.ninja>

git-svn-id: file:///srv/svn/repo/yukari/trunk@154 f3bd38d9-da89-464d-a02a-eb04e43141b5
---
 cmd/yukari/main.go | 22 +++++++++++-----------
 yukari.ini.5       |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

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 ,