From f706071048fdb3ebc8188610aecd6061de824a51 Mon Sep 17 00:00:00 2001 From: "Quentin McGaw (desktop)" Date: Thu, 26 Aug 2021 19:54:48 +0000 Subject: [PATCH] Fix: `FIREWALL_VPN_INPUT_PORTS` for Wireguard --- cmd/gluetun/main.go | 3 ++- internal/configuration/vpn.go | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/cmd/gluetun/main.go b/cmd/gluetun/main.go index a10b2971..ad3792a6 100644 --- a/cmd/gluetun/main.go +++ b/cmd/gluetun/main.go @@ -294,7 +294,8 @@ func _main(ctx context.Context, buildInfo models.BuildInformation, } for _, vpnPort := range allSettings.Firewall.VPNInputPorts { - err = firewallConf.SetAllowedPort(ctx, vpnPort, allSettings.VPN.OpenVPN.Interface) + vpnIntf := allSettings.VPN.VPNInterface() + err = firewallConf.SetAllowedPort(ctx, vpnPort, vpnIntf) if err != nil { return err } diff --git a/internal/configuration/vpn.go b/internal/configuration/vpn.go index 2c447561..7056fb33 100644 --- a/internal/configuration/vpn.go +++ b/internal/configuration/vpn.go @@ -87,3 +87,11 @@ func (settings VPN) isOpenVPNCustomConfig(env params.Interface) (ok bool) { s, err := env.Get("OPENVPN_CUSTOM_CONFIG") return err == nil && s != "" } + +func (settings VPN) VPNInterface() (intf string) { + if settings.Type == constants.Wireguard { + return settings.Wireguard.Interface + } + // OpenVPN + return settings.OpenVPN.Interface +}