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

Maint: WIREGUARD_PORT to WIREGUARD_ENDPOINT_PORT

Browse Source
This commit is contained in:
Quentin McGaw (desktop)
2021-09-13 20:06:47 +00:00
parent 8645d978ba
commit 2cf7f7b268
6 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/configuration/custom.go
View File

@@ -21,7 +21,7 @@ func (settings *Provider) readCustom(r reader, vpnType string) (err error) {
case constants.OpenVPN:
return settings.ServerSelection.OpenVPN.readCustom(r)
case constants.Wireguard:
return settings.ServerSelection.Wireguard.readCustom(r.env)
return settings.ServerSelection.Wireguard.readCustom(r)
default:
return fmt.Errorf("%w: for VPN type %s", errCustomNotSupported, vpnType)
}
@@ -56,21 +56,22 @@ func (settings *OpenVPN) readCustom(r reader) (err error) {
return nil
}
func (settings *WireguardSelection) readCustom(env params.Interface) (err error) {
settings.PublicKey, err = env.Get("WIREGUARD_PUBLIC_KEY",
func (settings *WireguardSelection) readCustom(r reader) (err error) {
settings.PublicKey, err = r.env.Get("WIREGUARD_PUBLIC_KEY",
params.CaseSensitiveValue(), params.Compulsory())
if err != nil {
return fmt.Errorf("environment variable WIREGUARD_PUBLIC_KEY: %w", err)
}
settings.EndpointIP, err = readWireguardEndpointIP(env)
settings.EndpointIP, err = readWireguardEndpointIP(r.env)
if err != nil {
return err
}
settings.EndpointPort, err = env.Port("WIREGUARD_PORT", params.Compulsory())
settings.EndpointPort, err = r.env.Port("WIREGUARD_ENDPOINT_PORT", params.Compulsory(),
params.RetroKeys([]string{"WIREGUARD_PORT"}, r.onRetroActive))
if err != nil {
return fmt.Errorf("environment variable WIREGUARD_PORT: %w", err)
return fmt.Errorf("environment variable WIREGUARD_ENDPOINT_PORT: %w", err)
}
return nil