refactor(storage): new storage file structure

- 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)
This commit is contained in:
Quentin McGaw
2026-04-27 02:47:30 +00:00
parent 13503b0ae0
commit d9cc7dcffb
303 changed files with 304957 additions and 304344 deletions
+2 -2
View File
@@ -4,10 +4,10 @@ import (
"fmt"
"slices"
"github.com/qdm12/gluetun-servers/pkg/constants"
umodels "github.com/qdm12/gluetun-servers/pkg/models"
"github.com/qdm12/gluetun/internal/configuration/settings"
"github.com/qdm12/gluetun/internal/models"
"github.com/qdm12/gluetun/pkg/updaters/constants"
umodels "github.com/qdm12/gluetun/pkg/updaters/models"
)
type ConnectionDefaults struct {
+2 -2
View File
@@ -7,12 +7,12 @@ import (
"testing"
"github.com/golang/mock/gomock"
"github.com/qdm12/gluetun-servers/pkg/constants"
umodels "github.com/qdm12/gluetun-servers/pkg/models"
"github.com/qdm12/gluetun/internal/configuration/settings"
"github.com/qdm12/gluetun/internal/constants/providers"
"github.com/qdm12/gluetun/internal/models"
"github.com/qdm12/gluetun/internal/provider/common"
"github.com/qdm12/gluetun/pkg/updaters/constants"
umodels "github.com/qdm12/gluetun/pkg/updaters/models"
"github.com/stretchr/testify/assert"
)
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"context"
"fmt"
"github.com/qdm12/gluetun/pkg/updaters/models"
"github.com/qdm12/gluetun-servers/pkg/models"
)
type NoFetcher struct {
+1 -1
View File
@@ -4,11 +4,11 @@ import (
"fmt"
"strings"
"github.com/qdm12/gluetun-servers/pkg/constants"
"github.com/qdm12/gluetun/internal/configuration/settings"
"github.com/qdm12/gluetun/internal/constants/openvpn"
"github.com/qdm12/gluetun/internal/models"
"github.com/qdm12/gluetun/internal/openvpn/pkcs8"
"github.com/qdm12/gluetun/pkg/updaters/constants"
)
type OpenVPNProviderSettings struct {
+1 -1
View File
@@ -8,9 +8,9 @@ import (
"net/netip"
"sync"
"github.com/qdm12/gluetun-servers/pkg/constants"
"github.com/qdm12/gluetun/internal/configuration/settings"
"github.com/qdm12/gluetun/internal/models"
"github.com/qdm12/gluetun/pkg/updaters/constants"
)
// ConnectionPicker is a struct that holds the state of the connection pool cycler.
+1 -1
View File
@@ -4,9 +4,9 @@ import (
"net/netip"
"testing"
"github.com/qdm12/gluetun-servers/pkg/constants"
"github.com/qdm12/gluetun/internal/configuration/settings"
"github.com/qdm12/gluetun/internal/models"
"github.com/qdm12/gluetun/pkg/updaters/constants"
"github.com/stretchr/testify/assert"
)
+1 -1
View File
@@ -3,8 +3,8 @@ package utils
import (
"fmt"
"github.com/qdm12/gluetun-servers/pkg/constants"
"github.com/qdm12/gluetun/internal/configuration/settings"
"github.com/qdm12/gluetun/pkg/updaters/constants"
)
func getPort(selection settings.ServerSelection,
+1 -1
View File
@@ -3,8 +3,8 @@ package utils
import (
"testing"
"github.com/qdm12/gluetun-servers/pkg/constants"
"github.com/qdm12/gluetun/internal/configuration/settings"
"github.com/qdm12/gluetun/pkg/updaters/constants"
"github.com/stretchr/testify/assert"
)
+1 -1
View File
@@ -1,8 +1,8 @@
package utils
import (
"github.com/qdm12/gluetun-servers/pkg/constants"
"github.com/qdm12/gluetun/internal/configuration/settings"
"github.com/qdm12/gluetun/pkg/updaters/constants"
)
func getProtocol(selection settings.ServerSelection) (protocol string) {
+1 -1
View File
@@ -3,8 +3,8 @@ package utils
import (
"testing"
"github.com/qdm12/gluetun-servers/pkg/constants"
"github.com/qdm12/gluetun/internal/configuration/settings"
"github.com/qdm12/gluetun/pkg/updaters/constants"
"github.com/stretchr/testify/assert"
)