mirror of
https://github.com/qdm12/gluetun.git
synced 2026-05-08 04:50:11 +02:00
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>
86 lines
2.3 KiB
Go
86 lines
2.3 KiB
Go
package storage
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
"sort"
|
|
|
|
"github.com/qdm12/gluetun/internal/models"
|
|
)
|
|
|
|
// flushToFile flushes the merged servers data to files
|
|
// using the manifest file path given. It is not thread-safe.
|
|
func (s *Storage) flushToFile(manifestPath string) error {
|
|
const (
|
|
filePermission = 0o644
|
|
dirPermission = 0o755
|
|
)
|
|
|
|
serversDirectoryPath := filepath.Dir(manifestPath)
|
|
if err := os.MkdirAll(serversDirectoryPath, dirPermission); err != nil {
|
|
return fmt.Errorf("creating directory: %w", err)
|
|
}
|
|
|
|
for provider, providerServers := range s.mergedServers.ProviderToServers {
|
|
providerFilepath := providerServers.Filepath
|
|
if providerFilepath == "" {
|
|
providerFilepath = filepath.Join(serversDirectoryPath, provider+".json")
|
|
}
|
|
|
|
providerDirectoryPath := filepath.Dir(providerFilepath)
|
|
if err := os.MkdirAll(providerDirectoryPath, dirPermission); err != nil {
|
|
return fmt.Errorf("creating directory: %w", err)
|
|
}
|
|
}
|
|
|
|
metadata := map[string]any{"version": s.mergedServers.Version}
|
|
|
|
for provider, providerServers := range s.mergedServers.ProviderToServers {
|
|
sort.Sort(models.SortableServers(providerServers.Servers))
|
|
|
|
providerFilepath := providerServers.Filepath
|
|
if providerFilepath == "" {
|
|
providerFilepath = filepath.Join(serversDirectoryPath, provider+".json")
|
|
}
|
|
|
|
providerFile, err := os.OpenFile(providerFilepath,
|
|
os.O_CREATE|os.O_WRONLY|os.O_TRUNC, filePermission)
|
|
if err != nil {
|
|
return fmt.Errorf("opening servers data file for %s: %w", provider, err)
|
|
}
|
|
|
|
encoder := json.NewEncoder(providerFile)
|
|
encoder.SetIndent("", " ")
|
|
err = encoder.Encode(providerServers)
|
|
if err != nil {
|
|
_ = providerFile.Close()
|
|
return fmt.Errorf("encoding servers data for %s: %w", provider, err)
|
|
}
|
|
|
|
err = providerFile.Close()
|
|
if err != nil {
|
|
return fmt.Errorf("closing servers data file for %s: %w", provider, err)
|
|
}
|
|
|
|
metadata[provider] = map[string]string{"filepath": providerFilepath}
|
|
}
|
|
|
|
serversFile, err := os.OpenFile(manifestPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, filePermission)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
encoder := json.NewEncoder(serversFile)
|
|
encoder.SetIndent("", " ")
|
|
|
|
err = encoder.Encode(metadata)
|
|
if err != nil {
|
|
_ = serversFile.Close()
|
|
return err
|
|
}
|
|
|
|
return serversFile.Close()
|
|
}
|