support TLS

Clivern · Mar 12, 2019 · e03c857 · e03c857
1 parent 53bf53f
commit e03c857
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -28,6 +28,10 @@ app:
     port: 8080
     domain: example.com
     secret: sWUhHRcs4Aqa0MEnYwbuQln3EW8CZ0oD
+    tls:
+        status: off
+        pemPath: cert/server.pem
+        keyPath: cert/server.key
 
 log:
     level: info
@@ -333,7 +337,7 @@ Socket("ws://localhost:8080/ws/$ID/$TOKEN");
 
 [![Build Status](https://travis-ci.org/Clivern/Beaver.svg?branch=master)](https://travis-ci.org/Clivern/Beaver)
 [![GitHub license](https://img.shields.io/github/license/Clivern/Beaver.svg)](https://github.com/Clivern/Beaver/blob/master/LICENSE)
-[![Version](https://img.shields.io/badge/Version-1.1.2-red.svg)](https://github.com/Clivern/Beaver/releases)
+[![Version](https://img.shields.io/badge/Version-1.1.3-red.svg)](https://github.com/Clivern/Beaver/releases)
 [![Go Report Card](https://goreportcard.com/badge/github.com/Clivern/Beaver)](https://goreportcard.com/report/github.com/Clivern/Beaver)
 
 ## For contributors
@@ -368,6 +372,11 @@ Then Create a PR with the master branch.
 
 ## Changelog
 
+* Version 1.1.3:
+```
+Support TLS.
+```
+
 * Version 1.1.2:
 ```
 Update Docs.

diff --git a/beaver.go b/beaver.go
@@ -50,8 +50,6 @@ func main() {
 		return
 	}
 
-	os.Setenv("PORT", strconv.Itoa(config.Get("app", "port").Int(8080)))
-
 	if config.Get("app", "mode").String("dev") == "prod" {
 		gin.SetMode(gin.ReleaseMode)
 		gin.DisableConsoleColor()
@@ -127,5 +125,15 @@ func main() {
 
 	go socket.HandleMessages()
 
-	r.Run()
+	if config.Get("app", "tls", "status").Bool(false) {
+		r.RunTLS(
+			fmt.Sprintf(":%s", strconv.Itoa(config.Get("app", "port").Int(8080))),
+			config.Get("app", "tls", "pemPath").String(""),
+			config.Get("app", "tls", "keyPath").String(""),
+		)
+	} else {
+		r.Run(
+			fmt.Sprintf(":%s", strconv.Itoa(config.Get("app", "port").Int(8080))),
+		)
+	}
 }
diff --git a/config.travis.yml b/config.travis.yml
@@ -3,6 +3,10 @@ app:
     port: 8080
     domain: example.com
     secret: sWUhHRcs4Aqa0MEnYwbuQln3EW8CZ0oD
+    tls:
+        status: off
+        pemPath: cert/server.pem
+        keyPath: cert/server.key
 
 log:
     level: info

diff --git a/config.yml b/config.yml
@@ -3,6 +3,10 @@ app:
     port: 8080
     domain: example.com
     secret: sWUhHRcs4Aqa0MEnYwbuQln3EW8CZ0oD
+    tls:
+        status: off
+        pemPath: cert/server.pem
+        keyPath: cert/server.key
 
 log:
     level: info