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

feat(mullvad): OWNED to OWNED_ONLY

Browse Source
This commit is contained in:
Quentin McGaw (desktop)
2022-01-27 14:12:25 +00:00
parent 15800fd4ff
commit f3692cd47f
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
internal/configuration/sources/env/serverselection.go vendored
View File

@@ -59,9 +59,9 @@ func (r *Reader) readServerSelection(vpnProvider, vpnType string) (
}
// Mullvad only
ss.OwnedOnly, err = envToBoolPtr("OWNED")
ss.OwnedOnly, err = r.readOwnedOnly()
if err != nil {
return ss, fmt.Errorf("environment variable OWNED: %w", err)
return ss, err
}
// VPNUnlimited and ProtonVPN only
@@ -113,3 +113,21 @@ func readOpenVPNTargetIP() (ip net.IP, err error) {
return ip, nil
}
func (r *Reader) readOwnedOnly() (ownedOnly *bool, err error) {
// Retro-compatibility
ownedOnly, err = envToBoolPtr("OWNED")
if err != nil {
r.onRetroActive("OWNED", "OWNED_ONLY")
return nil, fmt.Errorf("environment variable OWNED: %w", err)
} else if ownedOnly != nil {
r.onRetroActive("OWNED", "OWNED_ONLY")
return ownedOnly, nil
}
ownedOnly, err = envToBoolPtr("OWNED_ONLY")
if err != nil {
return nil, fmt.Errorf("environment variable OWNED_ONLY: %w", err)
}
return ownedOnly, nil
}