From 1748a2ae1215e45136281ec77b19d52550cad3ea Mon Sep 17 00:00:00 2001 From: Quentin McGaw Date: Fri, 26 Feb 2021 03:32:26 +0000 Subject: [PATCH] Fix: HTTP proxy password and log settings reading --- internal/configuration/httpproxy.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/configuration/httpproxy.go b/internal/configuration/httpproxy.go index 6f8f4e2d..7502f51b 100644 --- a/internal/configuration/httpproxy.go +++ b/internal/configuration/httpproxy.go @@ -58,7 +58,7 @@ func (settings *HTTPProxy) read(r reader) (err error) { return err } - settings.Password, err = r.getFromEnvOrSecretFile("HTTPPROXY_USER", false, + settings.Password, err = r.getFromEnvOrSecretFile("HTTPPROXY_PASSWORD", false, []string{"TINYPROXY_PASSWORD", "PROXY_PASSWORD"}) if err != nil { return err @@ -95,10 +95,10 @@ func (settings *HTTPProxy) readLog(r reader) error { switch strings.ToLower(s) { case "on": - settings.Enabled = true + settings.Log = true // Retro compatibility case "info", "connect", "notice": - settings.Enabled = true + settings.Log = true } return nil