Browse Source

tls support and env file changing

AETH-erial 1 year ago
parent
commit
fa9eb8c786
3 changed files with 10 additions and 6 deletions
  1. 1 3
      Makefile
  2. 5 3
      cmd/webserver/webserver.go
  3. 4 0
      pkg/env/env.go

+ 1 - 3
Makefile

@@ -7,9 +7,7 @@ SWAG := $(shell command -v swag 2> /dev/null)
 
 build:
 	go build -ldflags "-X main.WEB_ROOT=/home/aeth/keiji/html \
-	-X main.DOMAIN_NAME=aetherial.dev \
-	-X main.REDIS_ADDR=127.0.0.1 \
-	-X main.REDIS_PORT=6739" \
+	-X main.DOMAIN_NAME=aetherial.dev" \
 	-o ./build/linux/$(WEBSERVER)/$(WEBSERVER) ./cmd/$(WEBSERVER)/$(WEBSERVER).go 
 
 format:

+ 5 - 3
cmd/webserver/webserver.go

@@ -14,8 +14,7 @@ import (
 
 var WEB_ROOT string
 var DOMAIN_NAME string
-var REDIS_PORT string
-var REDIS_ADDR string
+
 
 func main() {
 	args := os.Args
@@ -23,6 +22,8 @@ func main() {
 	if err != nil {
 		log.Fatal("Error when loading env file: ", err)
 	}
+	REDIS_PORT := os.Getenv("REDIS_PORT")
+	REDIS_ADDR := os.Getenv("REDIS_ADDR")
 	renderer := multitemplate.NewRenderer()
 	renderer.AddFromFiles(
 		"home",
@@ -71,6 +72,7 @@ func main() {
 	e := gin.Default()
 	e.HTMLRender = renderer
 	routes.Register(e, WEB_ROOT, DOMAIN_NAME, REDIS_PORT, REDIS_ADDR)
-	e.Run(fmt.Sprintf("%s:%s", os.Getenv("HOST_ADDR"), os.Getenv("HOST_PORT")))
+	e.RunTLS(fmt.Sprintf("%s:%s", os.Getenv("HOST_ADDR"), os.Getenv("HOST_PORT")),
+				os.Getenv(env.CHAIN), os.Getenv(env.KEY))
 
 }

+ 4 - 0
pkg/env/env.go

@@ -10,11 +10,15 @@ import (
 const IMAGE_STORE = "IMAGE_STORE"
 const HOST_PORT = "HOST_PORT"
 const HOST_ADDR = "HOST_ADDR"
+const CHAIN = "CHAIN"
+const KEY = "KEY"
 
 var REQUIRED_VARS = []string{
 	IMAGE_STORE,
 	HOST_PORT,
 	HOST_ADDR,
+	CHAIN,
+	KEY,
 
 }