diff --git a/server/cmd/main.go b/server/cmd/main.go index 02e2218..4cb8cef 100644 --- a/server/cmd/main.go +++ b/server/cmd/main.go @@ -27,6 +27,7 @@ import ( type args struct { Port string `arg:"-p" help:"web server port (default 8090)"` + IP string `arg:"-i" help:"web server addr (default empty)"` Ssl bool `help:"enables https"` SslPort string `help:"web server ssl port, If not set, will be set to default 8091 or taken from db(if stored previously). Accepted if --ssl enabled."` SslCert string `help:"path to ssl cert file. If not set, will be taken from db(if stored previously) or default self-signed certificate/key will be generated. Accepted if --ssl enabled."` @@ -115,7 +116,7 @@ func main() { } } - server.Start(params.Port, params.SslPort, params.SslCert, params.SslKey, params.Ssl, params.RDB, params.SearchWA) + server.Start(params.Port, params.IP, params.SslPort, params.SslCert, params.SslKey, params.Ssl, params.RDB, params.SearchWA) log.TLogln(server.WaitServer()) log.Close() time.Sleep(time.Second * 3) diff --git a/server/server.go b/server/server.go index 37986c9..88fe35b 100644 --- a/server/server.go +++ b/server/server.go @@ -11,7 +11,7 @@ import ( "server/web" ) -func Start(port, sslport, sslCert, sslKey string, sslEnabled, roSets, searchWA bool) { +func Start(port, ip, sslport, sslCert, sslKey string, sslEnabled, roSets, searchWA bool) { settings.InitSets(roSets, searchWA) // https checks if sslEnabled { @@ -50,8 +50,9 @@ func Start(port, sslport, sslCert, sslKey string, sslEnabled, roSets, searchWA b if port == "" { port = "8090" } + log.TLogln("Check web port", port) - l, err := net.Listen("tcp", ":"+port) + l, err := net.Listen("tcp", ip+":"+port) if l != nil { l.Close() } @@ -64,6 +65,7 @@ func Start(port, sslport, sslCert, sslKey string, sslEnabled, roSets, searchWA b // set settings http and https ports. Start web server. settings.Port = port settings.SslPort = sslport + settings.IP = ip web.Start() } diff --git a/server/settings/settings.go b/server/settings/settings.go index d3e640a..ee202e7 100644 --- a/server/settings/settings.go +++ b/server/settings/settings.go @@ -10,6 +10,7 @@ import ( var ( tdb TorrServerDB Path string + IP string Port string Ssl bool SslPort string diff --git a/server/web/server.go b/server/web/server.go index ee27444..79c5f1d 100644 --- a/server/web/server.go +++ b/server/web/server.go @@ -103,14 +103,14 @@ func Start() { settings.SetBTSets(settings.BTsets) } go func() { - log.TLogln("Start https server at port", settings.SslPort) - waitChan <- route.RunTLS(":"+settings.SslPort, settings.BTsets.SslCert, settings.BTsets.SslKey) + log.TLogln("Start https server at", settings.IP+":"+settings.SslPort) + waitChan <- route.RunTLS(settings.IP+":"+settings.SslPort, settings.BTsets.SslCert, settings.BTsets.SslKey) }() } go func() { - log.TLogln("Start http server at port", settings.Port) - waitChan <- route.Run(":" + settings.Port) + log.TLogln("Start http server at", settings.IP+":"+settings.Port) + waitChan <- route.Run(settings.IP + ":" + settings.Port) }() }