From 3b321e60b599fd528f8455232986d5edec2d54f8 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Mon, 13 Feb 2023 21:04:17 +0100 Subject: [PATCH] fix bug --- .gitignore | 1 + cmd/flags.go | 8 ++++---- cmd/main.go | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 8745935..3035107 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ build/ vendor/ pages certs.sqlite +.bash_history diff --git a/cmd/flags.go b/cmd/flags.go index a91c24c..5bc638b 100644 --- a/cmd/flags.go +++ b/cmd/flags.go @@ -89,17 +89,17 @@ var ( EnvVars: []string{"HOST"}, Value: "[::]", }, - &cli.StringFlag{ + &cli.UintFlag{ Name: "port", Usage: "specifies the https port to listen to ssl requests", EnvVars: []string{"PORT", "HTTPS_PORT"}, - Value: "443", + Value: 443, }, - &cli.StringFlag{ + &cli.UintFlag{ Name: "http-port", Usage: "specifies the http port, you also have to enable http server via ENABLE_HTTP_SERVER=true", EnvVars: []string{"HTTP_PORT"}, - Value: "80", + Value: 80, }, &cli.BoolFlag{ Name: "enable-http-server", diff --git a/cmd/main.go b/cmd/main.go index 5356c35..8a65d43 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -47,10 +47,10 @@ func Serve(ctx *cli.Context) error { rawDomain := ctx.String("raw-domain") mainDomainSuffix := ctx.String("pages-domain") rawInfoPage := ctx.String("raw-info-page") - listeningHost := fmt.Sprintf("%s:%s", ctx.String("host"), ctx.String("port")) - listeningSSLAddress := fmt.Sprintf("%s:%s", listeningHost, ctx.String("port")) + listeningHost := ctx.String("host") + listeningSSLAddress := fmt.Sprintf("%s:%d", listeningHost, ctx.Uint("port")) + listeningHTTPAddress := fmt.Sprintf("%s:%d", listeningHost, ctx.Uint("http-port")) enableHTTPServer := ctx.Bool("enable-http-server") - listeningHTTPAddress := fmt.Sprintf("%s:%s", listeningHost, ctx.String("http-port")) allowedCorsDomains := AllowedCorsDomains if rawDomain != "" {