fix root and addr default error

This commit is contained in:
codeskyblue
2016-08-02 16:06:44 +08:00
parent 07e001fc4d
commit b444194496
2 changed files with 5 additions and 3 deletions

View File

@@ -78,6 +78,8 @@ func versionMessage() string {
func parseFlags() error {
// initial default conf
gcfg.Root = "./"
gcfg.Addr = ":8000"
gcfg.Theme = "black"
gcfg.PlistProxy = defaultPlistProxy
gcfg.GoogleTrackerId = "UA-81205425-2"
@@ -86,8 +88,8 @@ func parseFlags() error {
kingpin.HelpFlag.Short('h')
kingpin.Version(versionMessage())
kingpin.Flag("conf", "config file path, yaml format").FileVar(&gcfg.Conf)
kingpin.Flag("root", "root directory").Short('r').Default("./").StringVar(&gcfg.Root)
kingpin.Flag("addr", "listen address").Short('a').Default(":8000").StringVar(&gcfg.Addr)
kingpin.Flag("root", "root directory, default ./").Short('r').StringVar(&gcfg.Root)
kingpin.Flag("addr", "listen address, default :8000").Short('a').StringVar(&gcfg.Addr)
kingpin.Flag("cert", "tls cert.pem path").StringVar(&gcfg.Cert)
kingpin.Flag("key", "tls key.pem path").StringVar(&gcfg.Key)
kingpin.Flag("httpauth", "HTTP basic auth (ex: user:pass)").StringVar(&gcfg.HttpAuth)

2
testdata/config.yml vendored
View File

@@ -1,5 +1,5 @@
---
addr: ":8000"
addr: ":4000"
title: "hello world"
theme: green
debug: true