self-hosted/teleport
self-hosted/teleport
1
0
Fork 0
mirror of https://github.com/gravitational/teleport synced 2024-10-23 02:32:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed tests

Browse source
This commit is contained in:
Ev Kontsevoy 2016-04-09 20:15:28 -07:00
parent 885d755158
commit 4011fb9439
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/config/configuration.go
View file

@ -318,9 +318,6 @@ func applyString(src string, target *string) bool {
// Configure merges command line arguments with what's in a configuration file
// with CLI commands taking precedence
func Configure(clf *CommandLineFlags) (cfg *service.Config, err error) {
// create the default configuration:
cfg = service.MakeDefaultConfig()
// load /etc/teleport.yaml and apply it's values:
fileConf, err := readConfigFile(clf.ConfigFile)
if err != nil {

3
tool/teleport/main.go
View file

@ -101,6 +101,9 @@ func run(cmdlineArgs []string, testRun bool) (executedCommand string, appliedCon
utils.FatalError(err)
}
// create the default configuration:
appliedConfig = service.MakeDefaultConfig()
// execute the selected command unless we're running tests
if !testRun {
switch command {