chore(sources/env): bump gosettings to v0.3.0-rc9
This commit is contained in:
@@ -1,9 +1,6 @@
|
||||
package env
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/qdm12/gluetun/internal/configuration/settings"
|
||||
"github.com/qdm12/gosettings/sources/env"
|
||||
)
|
||||
@@ -11,16 +8,16 @@ import (
|
||||
func (s *Source) readShadowsocks() (shadowsocks settings.Shadowsocks, err error) {
|
||||
shadowsocks.Enabled, err = env.BoolPtr("SHADOWSOCKS")
|
||||
if err != nil {
|
||||
return shadowsocks, fmt.Errorf("environment variable SHADOWSOCKS: %w", err)
|
||||
return shadowsocks, err
|
||||
}
|
||||
|
||||
shadowsocks.Address = s.readShadowsocksAddress()
|
||||
shadowsocks.LogAddresses, err = env.BoolPtr("SHADOWSOCKS_LOG")
|
||||
if err != nil {
|
||||
return shadowsocks, fmt.Errorf("environment variable SHADOWSOCKS_LOG: %w", err)
|
||||
return shadowsocks, err
|
||||
}
|
||||
shadowsocks.CipherName = s.readShadowsocksCipher()
|
||||
shadowsocks.Password = env.StringPtr("SHADOWSOCKS_PASSWORD", env.ForceLowercase(false))
|
||||
shadowsocks.Password = env.Get("SHADOWSOCKS_PASSWORD", env.ForceLowercase(false))
|
||||
|
||||
return shadowsocks, nil
|
||||
}
|
||||
@@ -28,20 +25,20 @@ func (s *Source) readShadowsocks() (shadowsocks settings.Shadowsocks, err error)
|
||||
func (s *Source) readShadowsocksAddress() (address string) {
|
||||
key, value := s.getEnvWithRetro("SHADOWSOCKS_LISTENING_ADDRESS",
|
||||
[]string{"SHADOWSOCKS_PORT"})
|
||||
if value == "" {
|
||||
if value == nil {
|
||||
return ""
|
||||
}
|
||||
|
||||
if key == "SHADOWSOCKS_LISTENING_ADDRESS" {
|
||||
return value
|
||||
return *value
|
||||
}
|
||||
|
||||
// Retro-compatibility
|
||||
return ":" + value
|
||||
return ":" + *value
|
||||
}
|
||||
|
||||
func (s *Source) readShadowsocksCipher() (cipher string) {
|
||||
_, cipher = s.getEnvWithRetro("SHADOWSOCKS_CIPHER",
|
||||
envKey, _ := s.getEnvWithRetro("SHADOWSOCKS_CIPHER",
|
||||
[]string{"SHADOWSOCKS_METHOD"})
|
||||
return strings.ToLower(cipher)
|
||||
return env.String(envKey)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user