diff --git a/Dockerfile b/Dockerfile index ada97fa8..cb4b997d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -90,7 +90,7 @@ ENV VPNSP=pia \ WIREGUARD_PRIVATE_KEY= \ WIREGUARD_PRESHARED_KEY= \ WIREGUARD_PUBLIC_KEY= \ - WIREGUARD_ADDRESS= \ + WIREGUARD_ADDRESSES= \ # VPN server filtering REGION= \ COUNTRY= \ diff --git a/README.md b/README.md index a9f3bd5e..6eb11ffe 100644 --- a/README.md +++ b/README.md @@ -117,7 +117,7 @@ services: - OPENVPN_PASSWORD= # Wireguard: # - WIREGUARD_PRIVATE_KEY=wOEI9rqqbDwnN8/Bpp22sVz48T71vJ4fYmFWujulwUU= - # - WIREGUARD_ADDRESS=10.64.222.21/32 + # - WIREGUARD_ADDRESSES=10.64.222.21/32 # Timezone for accurate log times - TZ= ``` diff --git a/internal/configuration/sources/env/wireguard.go b/internal/configuration/sources/env/wireguard.go index 0508855c..5fd3917b 100644 --- a/internal/configuration/sources/env/wireguard.go +++ b/internal/configuration/sources/env/wireguard.go @@ -3,7 +3,6 @@ package env import ( "fmt" "net" - "os" "strings" "github.com/qdm12/gluetun/internal/configuration/settings" @@ -16,15 +15,15 @@ func (r *Reader) readWireguard() (wireguard settings.Wireguard, err error) { wireguard.PrivateKey = envToStringPtr("WIREGUARD_PRIVATE_KEY") wireguard.PreSharedKey = envToStringPtr("WIREGUARD_PRESHARED_KEY") _, wireguard.Interface = r.getEnvWithRetro("VPN_INTERFACE", "WIREGUARD_INTERFACE") - wireguard.Addresses, err = readWireguardAddresses() + wireguard.Addresses, err = r.readWireguardAddresses() if err != nil { return wireguard, err // already wrapped } return wireguard, nil } -func readWireguardAddresses() (addresses []net.IPNet, err error) { - addressesCSV := os.Getenv("WIREGUARD_ADDRESS") +func (r *Reader) readWireguardAddresses() (addresses []net.IPNet, err error) { + key, addressesCSV := r.getEnvWithRetro("WIREGUARD_ADDRESSES", "WIREGUARD_ADDRESS") if addressesCSV == "" { return nil, nil } @@ -34,7 +33,7 @@ func readWireguardAddresses() (addresses []net.IPNet, err error) { for i, addressString := range addressStrings { ip, ipNet, err := net.ParseCIDR(addressString) if err != nil { - return nil, fmt.Errorf("environment variable WIREGUARD_ADDRESS: %w", err) + return nil, fmt.Errorf("environment variable %s: %w", key, err) } ipNet.IP = ip addresses[i] = *ipNet