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

hotfix(updater): defaults for settings in CLI mode

Browse Source
This commit is contained in:
Quentin McGaw
2022-01-07 22:29:30 +00:00
parent b32c01c11a
commit b0c2d5f299
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/cli/update.go
View File

@@ -73,6 +73,8 @@ func (c *CLI) Update(ctx context.Context, args []string, logger UpdaterLogger) e
options.Providers = strings.Split(csvProviders, ",") options.Providers = strings.Split(csvProviders, ",")
} }
options.SetDefaults()
err := options.Validate() err := options.Validate()
if err != nil { if err != nil {
return fmt.Errorf("options validation failed: %w", err) return fmt.Errorf("options validation failed: %w", err)

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

@@ -118,7 +118,7 @@ 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.Updater.SetDefaults()
s.Version.setDefaults() s.Version.setDefaults()
s.VPN.setDefaults() s.VPN.setDefaults()
} }

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

@@ -85,7 +85,7 @@ 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() {
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)