admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(updater): UPDATER_VPN_SERVICE_PROVIDERS

Browse Source 
- Updater defaults to update the VPN provider in use if enabled
This commit is contained in:
Quentin McGaw
2022-01-26 22:40:57 +00:00
parent bcf9bfa5d3
commit 1e3f878470
4 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/cli/update.go
View File

@@ -78,7 +78,7 @@ func (c *CLI) Update(ctx context.Context, args []string, logger UpdaterLogger) e
options.Providers = strings.Split(csvProviders, ",") options.Providers = strings.Split(csvProviders, ",")
} }
options.SetDefaults() options.SetDefaults(options.Providers[0])
err := options.Validate() err := options.Validate()
if err != nil { if err != nil {

2
internal/configuration/settings/settings.go
View File

@@ -124,9 +124,9 @@ func (s *Settings) SetDefaults() {
s.PublicIP.setDefaults() s.PublicIP.setDefaults()
s.Shadowsocks.setDefaults() s.Shadowsocks.setDefaults()
s.System.setDefaults() s.System.setDefaults()
s.Updater.SetDefaults()
s.Version.setDefaults() s.Version.setDefaults()
s.VPN.setDefaults() s.VPN.setDefaults()
s.Updater.SetDefaults(*s.VPN.Provider.Name)
s.Pprof.SetDefaults() s.Pprof.SetDefaults()
} }

7
internal/configuration/settings/updater.go
View File

@@ -89,10 +89,13 @@ func (u *Updater) overrideWith(other Updater) {
u.CLI = helpers.MergeWithBool(u.CLI, other.CLI) u.CLI = helpers.MergeWithBool(u.CLI, other.CLI)
} }
func (u *Updater) SetDefaults() { func (u *Updater) SetDefaults(vpnProvider string) {
u.Period = helpers.DefaultDuration(u.Period, 0) u.Period = helpers.DefaultDuration(u.Period, 0)
u.DNSAddress = helpers.DefaultIP(u.DNSAddress, net.IPv4(1, 1, 1, 1)) u.DNSAddress = helpers.DefaultIP(u.DNSAddress, net.IPv4(1, 1, 1, 1))
u.CLI = helpers.DefaultBool(u.CLI, false) u.CLI = helpers.DefaultBool(u.CLI, false)
if len(u.Providers) == 0 {
u.Providers = []string{vpnProvider}
}
} }
func (u Updater) String() string { func (u Updater) String() string {
@@ -100,7 +103,7 @@ func (u Updater) String() string {
} }
func (u Updater) toLinesNode() (node *gotree.Node) { func (u Updater) toLinesNode() (node *gotree.Node) {
if *u.Period == 0 { if *u.Period == 0 || len(u.Providers) == 0 {
return nil return nil
} }

9
internal/configuration/sources/env/updater.go vendored
View File

@@ -7,7 +7,6 @@ import (
"time" "time"
"github.com/qdm12/gluetun/internal/configuration/settings" "github.com/qdm12/gluetun/internal/configuration/settings"
"github.com/qdm12/gluetun/internal/constants"
) )
func readUpdater() (updater settings.Updater, err error) { func readUpdater() (updater settings.Updater, err error) {
@@ -21,13 +20,7 @@ func readUpdater() (updater settings.Updater, err error) {
return updater, err return updater, err
} }
// TODO use current provider being used updater.Providers = envToCSV("UPDATER_VPN_SERVICE_PROVIDERS")
for _, provider := range constants.AllProviders() {
if provider == constants.Custom {
continue
}
updater.Providers = append(updater.Providers, provider)
}
return updater, nil return updater, nil
} }