feat(mullvad): OWNED to OWNED_ONLY
This commit is contained in:
@@ -100,7 +100,7 @@ ENV VPNSP=pia \
|
|||||||
SERVER_HOSTNAME= \
|
SERVER_HOSTNAME= \
|
||||||
# # Mullvad only:
|
# # Mullvad only:
|
||||||
ISP= \
|
ISP= \
|
||||||
OWNED=no \
|
OWNED_ONLY=no \
|
||||||
# # Private Internet Access only:
|
# # Private Internet Access only:
|
||||||
PIA_ENCRYPTION= \
|
PIA_ENCRYPTION= \
|
||||||
PORT_FORWARDING=off \
|
PORT_FORWARDING=off \
|
||||||
|
|||||||
@@ -59,9 +59,9 @@ func (r *Reader) readServerSelection(vpnProvider, vpnType string) (
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Mullvad only
|
// Mullvad only
|
||||||
ss.OwnedOnly, err = envToBoolPtr("OWNED")
|
ss.OwnedOnly, err = r.readOwnedOnly()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return ss, fmt.Errorf("environment variable OWNED: %w", err)
|
return ss, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// VPNUnlimited and ProtonVPN only
|
// VPNUnlimited and ProtonVPN only
|
||||||
@@ -113,3 +113,21 @@ func readOpenVPNTargetIP() (ip net.IP, err error) {
|
|||||||
|
|
||||||
return ip, nil
|
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
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user