mirror of
https://github.com/qdm12/gluetun.git
synced 2026-07-27 04:46:24 +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.3 KiB
Go
55 lines
1.3 KiB
Go
package publicip
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"reflect"
|
|
|
|
"github.com/qdm12/gluetun-servers/pkg/publicip/api"
|
|
"github.com/qdm12/gluetun/internal/configuration/settings"
|
|
)
|
|
|
|
func (l *Loop) update(partialUpdate settings.PublicIP) (err error) {
|
|
l.settingsMutex.Lock()
|
|
defer l.settingsMutex.Unlock()
|
|
|
|
updatedSettings, err := l.settings.UpdateWith(partialUpdate)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if *l.settings.IPFilepath != *updatedSettings.IPFilepath {
|
|
switch {
|
|
case *l.settings.IPFilepath == "":
|
|
err = persistPublicIP(*updatedSettings.IPFilepath,
|
|
l.ipData.IP.String(), l.puid, l.pgid)
|
|
if err != nil {
|
|
return fmt.Errorf("persisting ip data: %w", err)
|
|
}
|
|
case *updatedSettings.IPFilepath == "":
|
|
err = os.Remove(*l.settings.IPFilepath)
|
|
if err != nil {
|
|
return fmt.Errorf("removing ip data file path: %w", err)
|
|
}
|
|
default:
|
|
err = os.Rename(*l.settings.IPFilepath, *updatedSettings.IPFilepath)
|
|
if err != nil {
|
|
return fmt.Errorf("renaming ip data file path: %w", err)
|
|
}
|
|
}
|
|
}
|
|
|
|
if !reflect.DeepEqual(l.settings.APIs, updatedSettings.APIs) {
|
|
newFetchers, err := api.New(makeNameTokenPairs(updatedSettings.APIs), l.httpClient)
|
|
if err != nil {
|
|
return fmt.Errorf("creating fetchers: %w", err)
|
|
}
|
|
|
|
l.fetcher.UpdateFetchers(newFetchers)
|
|
}
|
|
|
|
l.settings = updatedSettings
|
|
|
|
return nil
|
|
}
|