admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(settings): OPENVPN_CUSTOM_CONFIG precedence for custom provider only if VPN_SERVICE_PROVIDER is empty

Browse Source
This commit is contained in:
Quentin McGaw
2022-08-25 04:01:17 +00:00
parent 4faef87c03
commit fba73a0a0f
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
internal/configuration/sources/env/provider.go vendored
View File

@@ -31,15 +31,18 @@ func (r *Reader) readProvider(vpnType string) (provider settings.Provider, err e
func (r *Reader) readVPNServiceProvider(vpnType string) (vpnProviderPtr *string) { func (r *Reader) readVPNServiceProvider(vpnType string) (vpnProviderPtr *string) {
_, s := r.getEnvWithRetro("VPN_SERVICE_PROVIDER", "VPNSP") _, s := r.getEnvWithRetro("VPN_SERVICE_PROVIDER", "VPNSP")
s = strings.ToLower(s) if s == "" {
switch { if vpnType != vpn.Wireguard && getCleanedEnv("OPENVPN_CUSTOM_CONFIG") != "" {
case vpnType != vpn.Wireguard && // retro compatibility
getCleanedEnv("OPENVPN_CUSTOM_CONFIG") != "": // retro compatibility return stringPtr(providers.Custom)
return stringPtr(providers.Custom) }
case s == "":
return nil return nil
case s == "pia": // retro compatibility }
s = strings.ToLower(s)
if s == "pia" { // retro compatibility
return stringPtr(providers.PrivateInternetAccess) return stringPtr(providers.PrivateInternetAccess)
} }
return stringPtr(s) return stringPtr(s)
} }