From f3edf63fb2c863e35e58c2b72440913b5358b262 Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Fri, 1 Sep 2017 13:17:10 +0100 Subject: [PATCH] fix #226 Former-commit-id: 7a2d0e67b2320af58b04da5e5834c0ed6a0ec137 [formerly 468e34a7bbadffdfc268c072b4460c99beb066d9] [formerly 7a962e989a213218868b02cfdd7c289ca0b6831e [formerly 2a5aa21b8d7c2207db077a62921125e2a95d03c6]] Former-commit-id: 2f443bbdf9518e66136ab97cf8c2f7e434a65f7b [formerly abcf5d2dc1aaa8b034bbe7b958cdec14feaef1b4] Former-commit-id: 22cf31bc4973b51fbf9849f537e0191c65bf327a --- cmd/filemanager/main.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmd/filemanager/main.go b/cmd/filemanager/main.go index 7a358299..2524547b 100644 --- a/cmd/filemanager/main.go +++ b/cmd/filemanager/main.go @@ -32,6 +32,7 @@ var ( logfile string staticg string locale string + baseurl string port int noAuth bool allowCommands bool @@ -49,6 +50,7 @@ func init() { flag.StringVarP(&database, "database", "d", "./filemanager.db", "Database file") flag.StringVarP(&logfile, "log", "l", "stdout", "Errors logger; can use 'stdout', 'stderr' or file") flag.StringVarP(&scope, "scope", "s", ".", "Default scope option for new users") + flag.StringVarP(&baseurl, "baseurl", "", "Base URL") flag.StringVar(&commands, "commands", "git svn hg", "Default commands option for new users") flag.BoolVar(&allowCommands, "allow-commands", true, "Default allow commands option for new users") flag.BoolVar(&allowEdit, "allow-edit", true, "Default allow edit option for new users") @@ -74,6 +76,7 @@ func setupViper() { viper.SetDefault("StaticGen", "") viper.SetDefault("Locale", "en") viper.SetDefault("NoAuth", false) + viper.SetDefault("BaseURL", "") viper.BindPFlag("Port", flag.Lookup("port")) viper.BindPFlag("Address", flag.Lookup("address")) @@ -88,6 +91,7 @@ func setupViper() { viper.BindPFlag("Locale", flag.Lookup("locale")) viper.BindPFlag("StaticGen", flag.Lookup("staticgen")) viper.BindPFlag("NoAuth", flag.Lookup("no-auth")) + viper.BindPFlag("BaseURL", flag.Lookup("baseurl")) viper.SetConfigName("filemanager") viper.AddConfigPath(".") @@ -177,7 +181,7 @@ func handler() http.Handler { fm := &filemanager.FileManager{ NoAuth: viper.GetBool("NoAuth"), - BaseURL: "", + BaseURL: viper.GetString("BaseURL"), PrefixURL: "", DefaultUser: &filemanager.User{ AllowCommands: viper.GetBool("AllowCommands"),