chore(env): VPN_INTERFACE

- With retro-compatibility with `OPENVPN_INTERFACE`
- With retro-compatibility with `WIREGUARD_INTERFACE`
This commit is contained in:
Quentin McGaw
2022-01-29 15:00:04 +00:00
parent 0d8cb66d43
commit 5603e25542
5 changed files with 6 additions and 7 deletions

View File

@@ -9,13 +9,13 @@ import (
"github.com/qdm12/gluetun/internal/configuration/settings"
)
func readWireguard() (wireguard settings.Wireguard, err error) {
func (r *Reader) readWireguard() (wireguard settings.Wireguard, err error) {
defer func() {
err = unsetEnvKeys([]string{"WIREGUARD_PRIVATE_KEY", "WIREGUARD_PRESHARED_KEY"}, err)
}()
wireguard.PrivateKey = envToStringPtr("WIREGUARD_PRIVATE_KEY")
wireguard.PreSharedKey = envToStringPtr("WIREGUARD_PRESHARED_KEY")
wireguard.Interface = os.Getenv("WIREGUARD_INTERFACE")
_, wireguard.Interface = r.getEnvWithRetro("VPN_INTERFACE", "WIREGUARD_INTERFACE")
wireguard.Addresses, err = readWireguardAddresses()
if err != nil {
return wireguard, err // already wrapped