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

chore(example/updater): simplify update code for openvpn+wireguard servers

Browse Source
This commit is contained in:
Quentin McGaw
2024-07-31 16:08:49 +00:00
parent 5d75bbc869
commit 4c3da54303
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
internal/provider/example/updater/servers.go
View File

@@ -94,25 +94,27 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) (
maxServers := 2 * len(data.Servers) //nolint:gomnd maxServers := 2 * len(data.Servers) //nolint:gomnd
servers = make([]models.Server, 0, maxServers) servers = make([]models.Server, 0, maxServers)
for _, serverData := range data.Servers { for _, serverData := range data.Servers {
server := models.Server{ baseServer := models.Server{
Country: serverData.Country, Country: serverData.Country,
Region: serverData.Region, Region: serverData.Region,
City: serverData.City, City: serverData.City,
WgPubKey: serverData.WgPubKey, WgPubKey: serverData.WgPubKey,
} }
if serverData.OpenVPNHostname != "" { if serverData.OpenVPNHostname != "" {
server.VPN = vpn.OpenVPN openvpnServer := baseServer
server.UDP = true openvpnServer.VPN = vpn.OpenVPN
server.TCP = true openvpnServer.UDP = true
server.Hostname = serverData.OpenVPNHostname openvpnServer.TCP = true
server.IPs = hostToIPs[serverData.OpenVPNHostname] openvpnServer.Hostname = serverData.OpenVPNHostname
servers = append(servers, server) openvpnServer.IPs = hostToIPs[serverData.OpenVPNHostname]
servers = append(servers, openvpnServer)
} }
if serverData.WireguardHostname != "" { if serverData.WireguardHostname != "" {
server.VPN = vpn.Wireguard wireguardServer := baseServer
server.Hostname = serverData.WireguardHostname wireguardServer.VPN = vpn.Wireguard
server.IPs = hostToIPs[serverData.WireguardHostname] wireguardServer.Hostname = serverData.WireguardHostname
servers = append(servers, server) wireguardServer.IPs = hostToIPs[serverData.WireguardHostname]
servers = append(servers, wireguardServer)
} }
} }