From 119c9937d7d737aa74312db7f3fd267724a0a728 Mon Sep 17 00:00:00 2001 From: tigerbot Date: Wed, 29 Mar 2017 18:28:28 -0600 Subject: [PATCH] changed configuration read to work by default --- main.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/main.go b/main.go index 7102bea..e24a551 100644 --- a/main.go +++ b/main.go @@ -5,23 +5,22 @@ import ( "crypto/tls" "flag" "fmt" + "io" "io/ioutil" "log" "os" "time" "github.com/spf13/viper" - - "io" + lumberjack "gopkg.in/natefinch/lumberjack.v2" "git.daplie.com/Daplie/go-rvpn-server/rvpn/genericlistener" - lumberjack "gopkg.in/natefinch/lumberjack.v2" ) var ( logfile = "stdout" configPath = "./" - configFile = "go-rvpn-server.yaml" + configFile = "go-rvpn-server" loginfo *log.Logger logdebug *log.Logger @@ -77,7 +76,8 @@ func main() { loginfo = log.New(logoutput, "INFO: main: ", logFlags) logdebug = log.New(logoutput, "DEBUG: main:", logFlags) - viper.SetConfigName(configPath) + viper.SetConfigName(configFile) + viper.AddConfigPath(configPath) viper.AddConfigPath("./") err := viper.ReadInConfig() if err != nil {