mirror of
https://github.com/tulir/gomuks.git
synced 2025-04-20 18:43:41 -05:00
server: add -l / -listen flag
Allows setting a listen address (not just port) on the command line. It won't modify the config unless gomuks is being run for the first time.
This commit is contained in:
parent
69c127a0a2
commit
6897ba477c
2 changed files with 10 additions and 1 deletions
|
@ -31,13 +31,14 @@ import (
|
||||||
|
|
||||||
var wantHelp, _ = flag.MakeHelpFlag()
|
var wantHelp, _ = flag.MakeHelpFlag()
|
||||||
var wantVersion = flag.MakeFull("v", "version", "View gomuks version and quit.", "false").Bool()
|
var wantVersion = flag.MakeFull("v", "version", "View gomuks version and quit.", "false").Bool()
|
||||||
|
var wantListen = flag.MakeFull("l", "listen", "Set webserver listen address", "").String()
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
hicli.InitialDeviceDisplayName = "gomuks web"
|
hicli.InitialDeviceDisplayName = "gomuks web"
|
||||||
exhttp.AutoAllowCORS = false
|
exhttp.AutoAllowCORS = false
|
||||||
flag.SetHelpTitles(
|
flag.SetHelpTitles(
|
||||||
"gomuks - A Matrix client written in Go.",
|
"gomuks - A Matrix client written in Go.",
|
||||||
"gomuks [-hv]",
|
"gomuks [-hvl]",
|
||||||
)
|
)
|
||||||
err := flag.Parse()
|
err := flag.Parse()
|
||||||
|
|
||||||
|
@ -53,7 +54,11 @@ func main() {
|
||||||
os.Exit(0)
|
os.Exit(0)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
gmx := gomuks.NewGomuks()
|
gmx := gomuks.NewGomuks()
|
||||||
|
if *wantListen != "" {
|
||||||
|
gmx.Config.Web.ListenAddress = *wantListen
|
||||||
|
}
|
||||||
gmx.Version = version.Version
|
gmx.Version = version.Version
|
||||||
gmx.Commit = version.Commit
|
gmx.Commit = version.Commit
|
||||||
gmx.LinkifiedVersion = version.LinkifiedVersion
|
gmx.LinkifiedVersion = version.LinkifiedVersion
|
||||||
|
|
|
@ -83,6 +83,7 @@ func (gmx *Gomuks) LoadConfig() error {
|
||||||
if err != nil && !errors.Is(err, os.ErrNotExist) {
|
if err != nil && !errors.Is(err, os.ErrNotExist) {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
address := gmx.Config.Web.ListenAddress
|
||||||
gmx.Config = makeDefaultConfig()
|
gmx.Config = makeDefaultConfig()
|
||||||
changed := false
|
changed := false
|
||||||
if file != nil {
|
if file != nil {
|
||||||
|
@ -93,6 +94,9 @@ func (gmx *Gomuks) LoadConfig() error {
|
||||||
} else {
|
} else {
|
||||||
changed = true
|
changed = true
|
||||||
}
|
}
|
||||||
|
if address != "" {
|
||||||
|
gmx.Config.Web.ListenAddress = address
|
||||||
|
}
|
||||||
if gmx.Config.Web.TokenKey == "" {
|
if gmx.Config.Web.TokenKey == "" {
|
||||||
gmx.Config.Web.TokenKey = random.String(64)
|
gmx.Config.Web.TokenKey = random.String(64)
|
||||||
changed = true
|
changed = true
|
||||||
|
|
Loading…
Add table
Reference in a new issue