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)
59 lines
1.1 KiB
Go
59 lines
1.1 KiB
Go
package privateinternetaccess
|
|
|
|
import (
|
|
"net/netip"
|
|
|
|
"github.com/qdm12/gluetun-servers/pkg/constants"
|
|
"github.com/qdm12/gluetun-servers/pkg/models"
|
|
)
|
|
|
|
type nameToServer map[string]models.Server
|
|
|
|
func (nts nameToServer) add(name, hostname, region string,
|
|
tcp, udp, portForward bool, ip netip.Addr,
|
|
) (change bool) {
|
|
server, ok := nts[name]
|
|
if !ok {
|
|
change = true
|
|
server.VPN = constants.OpenVPN
|
|
server.ServerName = name
|
|
server.Hostname = hostname
|
|
server.Region = region
|
|
server.PortForward = portForward
|
|
}
|
|
|
|
if !server.TCP && tcp {
|
|
change = true
|
|
server.TCP = tcp
|
|
}
|
|
if !server.UDP && udp {
|
|
change = true
|
|
server.UDP = udp
|
|
}
|
|
|
|
ipFound := false
|
|
for _, existingIP := range server.IPs {
|
|
if ip == existingIP {
|
|
ipFound = true
|
|
break
|
|
}
|
|
}
|
|
|
|
if !ipFound {
|
|
change = true
|
|
server.IPs = append(server.IPs, ip)
|
|
}
|
|
|
|
nts[name] = server
|
|
|
|
return change
|
|
}
|
|
|
|
func (nts nameToServer) toServersSlice() (servers []models.Server) {
|
|
servers = make([]models.Server, 0, len(nts))
|
|
for _, server := range nts {
|
|
servers = append(servers, server)
|
|
}
|
|
return servers
|
|
}
|