mirror of
https://github.com/qdm12/gluetun.git
synced 2026-07-28 13:26:24 +02:00
Quentin McGaw
d9cc7dcffb
- new directory structure containing manifest.json and one json file per provider, by default. - the manifest.json file can specify a filepath for each vpn provider - each vpn provider json data file can contain the `"preferred": true` field to enforce it is used even if outdated, unless there is a version mismatch - `STORAGE_SERVERS_DIRECTORY_PATH` replaces `STORAGE_FILEPATH` (which is now a migration source only). It sets the directory where server manifest and per-provider JSON files are stored (default: `/gluetun/servers/`). - First-run migration: On startup, gluetun checks for the old /gluetun/servers.json file; if found and no new manifest exists, it automatically migrates all data to /gluetun/servers/ directory structure - Silent fallback: If legacy file isn't found, uses the new directory path normally - Legacy cleanup: After successful migration, attempts to remove the old fat JSON file (logs warning only if removal fails, e.g., read-only bind mounts)
48 lines
1019 B
Go
48 lines
1019 B
Go
package perfectprivacy
|
|
|
|
import (
|
|
"net/netip"
|
|
|
|
"github.com/qdm12/gluetun-servers/pkg/constants"
|
|
"github.com/qdm12/gluetun-servers/pkg/models"
|
|
)
|
|
|
|
type cityToServer map[string]models.Server
|
|
|
|
func (cts cityToServer) add(city string, ips []netip.Addr) {
|
|
server, ok := cts[city]
|
|
if !ok {
|
|
server.VPN = constants.OpenVPN
|
|
server.City = city
|
|
server.IPs = ips
|
|
server.TCP = true
|
|
server.UDP = true
|
|
} else {
|
|
// Do not insert duplicate IP addresses
|
|
existingIPs := make(map[string]struct{}, len(server.IPs))
|
|
for _, ip := range server.IPs {
|
|
existingIPs[ip.String()] = struct{}{}
|
|
}
|
|
|
|
for _, ip := range ips {
|
|
ipString := ip.String()
|
|
_, ok := existingIPs[ipString]
|
|
if ok {
|
|
continue
|
|
}
|
|
existingIPs[ipString] = struct{}{}
|
|
server.IPs = append(server.IPs, ip)
|
|
}
|
|
}
|
|
|
|
cts[city] = server
|
|
}
|
|
|
|
func (cts cityToServer) toServersSlice() (servers []models.Server) {
|
|
servers = make([]models.Server, 0, len(cts))
|
|
for _, server := range cts {
|
|
servers = append(servers, server)
|
|
}
|
|
return servers
|
|
}
|