mirror of
https://github.com/qdm12/gluetun.git
synced 2026-07-24 11:26:25 +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)
55 lines
1.1 KiB
Go
55 lines
1.1 KiB
Go
package privatevpn
|
|
|
|
import (
|
|
"net/netip"
|
|
|
|
"github.com/qdm12/gluetun-servers/pkg/constants"
|
|
"github.com/qdm12/gluetun-servers/pkg/models"
|
|
)
|
|
|
|
type hostToServer map[string]models.Server
|
|
|
|
// TODO check if server supports TCP and UDP.
|
|
func (hts hostToServer) add(host, country, city string) {
|
|
server, ok := hts[host]
|
|
if ok {
|
|
return
|
|
}
|
|
server.VPN = constants.OpenVPN
|
|
server.Hostname = host
|
|
server.Country = country
|
|
server.City = city
|
|
server.UDP = true
|
|
server.TCP = true
|
|
hts[host] = server
|
|
}
|
|
|
|
func (hts hostToServer) toHostsSlice() (hosts []string) {
|
|
hosts = make([]string, 0, len(hts))
|
|
for host := range hts {
|
|
hosts = append(hosts, host)
|
|
}
|
|
return hosts
|
|
}
|
|
|
|
func (hts hostToServer) adaptWithIPs(hostToIPs map[string][]netip.Addr) {
|
|
for host, IPs := range hostToIPs {
|
|
server := hts[host]
|
|
server.IPs = IPs
|
|
hts[host] = server
|
|
}
|
|
for host, server := range hts {
|
|
if len(server.IPs) == 0 {
|
|
delete(hts, host)
|
|
}
|
|
}
|
|
}
|
|
|
|
func (hts hostToServer) toServersSlice() (servers []models.Server) {
|
|
servers = make([]models.Server, 0, len(hts))
|
|
for _, server := range hts {
|
|
servers = append(servers, server)
|
|
}
|
|
return servers
|
|
}
|