mirror of
https://github.com/qdm12/gluetun.git
synced 2026-05-07 04:20:12 +02:00
Quentin McGaw
25f67cd170
- 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) Co-authored-by: Copilot <copilot@github.com>
53 lines
1.4 KiB
Go
53 lines
1.4 KiB
Go
package storage
|
|
|
|
import (
|
|
"embed"
|
|
"encoding/json"
|
|
"fmt"
|
|
"path"
|
|
|
|
serversmodule "github.com/qdm12/gluetun-servers/pkg/servers"
|
|
"github.com/qdm12/gluetun/internal/models"
|
|
)
|
|
|
|
//go:embed servers.json
|
|
var allServersEmbedFS embed.FS
|
|
|
|
func parseHardcodedServers() (allServers models.AllServers) {
|
|
f, err := allServersEmbedFS.Open("servers.json")
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
defer f.Close() // no-op
|
|
decoder := json.NewDecoder(f)
|
|
err = decoder.Decode(&allServers)
|
|
if err != nil {
|
|
panic("decoding servers.json: " + err.Error())
|
|
}
|
|
|
|
for provider, metadata := range allServers.ProviderToServers {
|
|
filename := path.Base(metadata.Filepath)
|
|
providerFile, err := serversmodule.Files.Open(filename)
|
|
if err != nil {
|
|
panic(fmt.Sprintf("reading embedded provider file %s for %s: %s", filename, provider, err))
|
|
}
|
|
defer providerFile.Close() // no-op
|
|
|
|
var providerServers models.Servers
|
|
decoder := json.NewDecoder(providerFile)
|
|
err = decoder.Decode(&providerServers)
|
|
if err != nil {
|
|
panic(fmt.Sprintf("JSON decoding embedded provider file %s for %s: %s",
|
|
filename, provider, err))
|
|
} else if providerServers.Filepath != "" {
|
|
panic(fmt.Sprintf("embedded provider file %s for %s should not have filepath set",
|
|
filename, provider))
|
|
}
|
|
|
|
providerServers.Filepath = metadata.Filepath // inherit filepath from servers.json
|
|
allServers.ProviderToServers[provider] = providerServers
|
|
}
|
|
|
|
return allServers
|
|
}
|