mirror of
https://github.com/qdm12/gluetun.git
synced 2026-07-25 20:06: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)
16 lines
384 B
Go
16 lines
384 B
Go
package cyberghost
|
|
|
|
func mergeCountryCodes(base, extend map[string]string) (merged map[string]string) {
|
|
merged = make(map[string]string, len(base))
|
|
for countryCode, region := range base {
|
|
merged[countryCode] = region
|
|
}
|
|
for countryCode := range base {
|
|
delete(extend, countryCode)
|
|
}
|
|
for countryCode, region := range extend {
|
|
merged[countryCode] = region
|
|
}
|
|
return merged
|
|
}
|