chore(servers): remove "udp": true for Wireguard

This commit is contained in:
Quentin McGaw
2022-08-25 13:24:22 +00:00
parent d1c5e00df8
commit 4ace99f318
7 changed files with 30 additions and 939 deletions

View File

@@ -52,27 +52,26 @@ func (u *Updater) FetchServers(ctx context.Context, minServers int) (
servers = make([]models.Server, 0, len(hosts))
for _, serverData := range data.Servers {
vpnType := vpn.OpenVPN
hostname := serverData.Hostnames.OpenVPN
tcp := true
wgPubKey := ""
if hostname == "" {
vpnType = vpn.Wireguard
hostname = serverData.Hostnames.Wireguard
tcp = false
wgPubKey = serverData.WgPubKey
}
server := models.Server{
VPN: vpnType,
Country: serverData.Country,
City: serverData.City,
ISP: serverData.ISP,
Hostname: hostname,
WgPubKey: wgPubKey,
TCP: tcp,
UDP: true,
IPs: hostToIPs[hostname],
Country: serverData.Country,
City: serverData.City,
ISP: serverData.ISP,
}
switch {
case serverData.Hostnames.OpenVPN != "":
server.Hostname = serverData.Hostnames.OpenVPN
server.VPN = vpn.OpenVPN
server.UDP = true
server.TCP = true
server.IPs = hostToIPs[server.Hostname]
case serverData.Hostnames.Wireguard != "":
server.Hostname = serverData.Hostnames.Wireguard
server.VPN = vpn.Wireguard
server.IPs = hostToIPs[server.Hostname]
server.WgPubKey = serverData.WgPubKey
default:
warning := fmt.Sprintf("server data %v has no OpenVPN nor Wireguard hostname", serverData)
warnings = append(warnings, warning)
}
servers = append(servers, server)
}