File tree Expand file tree Collapse file tree 1 file changed +12
-4
lines changed
Expand file tree Collapse file tree 1 file changed +12
-4
lines changed Original file line number Diff line number Diff line change @@ -79,10 +79,6 @@ func InitializeConfig() error {
7979 Config .Tailscale .Providers = make (map [string ]* TailscaleServerConfig )
8080 Config .Docker = make (map [string ]* DockerTargetProviderConfig )
8181 Config .Files = make (map [string ]* FilesTargetProviderConfig )
82- // load default values
83- if err := defaults .Set (Config ); err != nil {
84- fmt .Printf ("Error loading defaults: %v" , err )
85- }
8682
8783 file := flag .String ("config" , "/config/tsdproxy.yaml" , "loag configuration from file" )
8884 flag .Parse ()
@@ -96,12 +92,24 @@ func InitializeConfig() error {
9692 return err
9793 }
9894 println ("Generating default configuration to:" , * file )
95+
96+ if err := defaults .Set (Config ); err != nil {
97+ fmt .Printf ("Error loading defaults: %v" , err )
98+ }
99+
99100 Config .generateDefaultProviders ()
100101 if err := fileConfig .Save (); err != nil {
101102 return err
102103 }
103104 }
104105
106+ // Load default values.
107+ // Make sure to set default values after loading from file
108+ // unless defaults of map type are not loaded.
109+ if err := defaults .Set (Config ); err != nil {
110+ fmt .Printf ("Error loading defaults: %v" , err )
111+ }
112+
105113 // load auth keys from files
106114 for _ , d := range Config .Tailscale .Providers {
107115 if d .AuthKeyFile != "" {
You can’t perform that action at this time.
0 commit comments