Only define an empty default route if no route is set AND a subconfig is

used

Author: cyrilst

pkg/utils/config.go

@@ -169,6 +169,9 @@ func parseSubConfig(config *Config, subconfig *subConfig) error {
 	}
 
 	// merge routes
+	if config.Routes == nil {
+		config.Routes = defaultRoutes
+	}
 	for service, opts := range subconfig.Routes {
 		config.Routes[service] = opts
 	}
@@ -228,10 +231,6 @@ func LoadConfig(filename, currentUsername, sid string, start time.Time, groups m
 		config.SSH.Args = defaultSSHArgs
 	}
 
-	if config.Routes == nil {
-		config.Routes = defaultRoutes
-	}
-
 	// we have to use a slice of maps in order to have ordered maps
 	for _, groupconfigs := range config.Groups {
 		for groupnames, groupconfig := range groupconfigs {