Przeglądaj źródła

added an env var to control ssl

AETH-erial 7 miesięcy temu
rodzic
commit
f9b68cf5e7
2 zmienionych plików z 3 dodań i 6 usunięć
  1. 1 6
      cmd/webserver/webserver.go
  2. 2 0
      pkg/env/env.go

+ 1 - 6
cmd/webserver/webserver.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"flag"
 	"fmt"
 	"log"
 	"os"
@@ -18,8 +17,6 @@ var DOMAIN_NAME string
 
 
 func main() {
-	ssl := flag.Bool("ssl", false, "Set this to true to run the server with ssl. Leave blank to run in plaintext.")
-	flag.Parse()
 	args := os.Args
 	err := env.LoadAndVerifyEnv(args[1], env.REQUIRED_VARS)
 	if err != nil {
@@ -90,11 +87,9 @@ func main() {
 	e := gin.Default()
 	e.HTMLRender = renderer
 	routes.Register(e, WEB_ROOT, DOMAIN_NAME, REDIS_PORT, REDIS_ADDR)
-	if *ssl {
+	if os.Getenv("SSL_MODE") == "ON" {
 		e.RunTLS(fmt.Sprintf("%s:%s", os.Getenv("HOST_ADDR"), os.Getenv("HOST_PORT")),
 		os.Getenv(env.CHAIN), os.Getenv(env.KEY))
 	}
 	e.Run(fmt.Sprintf("%s:%s", os.Getenv("HOST_ADDR"), os.Getenv("HOST_PORT")))
-
-
 }

+ 2 - 0
pkg/env/env.go

@@ -10,6 +10,7 @@ import (
 const IMAGE_STORE = "IMAGE_STORE"
 const HOST_PORT = "HOST_PORT"
 const HOST_ADDR = "HOST_ADDR"
+const SSL_MODE = "SSL_MODE"
 const CHAIN = "CHAIN"
 const KEY = "KEY"
 
@@ -19,6 +20,7 @@ var REQUIRED_VARS = []string{
 	HOST_ADDR,
 	CHAIN,
 	KEY,
+	SSL_MODE,
 
 }