mitchell/mywebsite
1
0
Fork 0
mirror of https://github.com/mgerb/mywebsite synced 2026-01-11 02:12:53 +00:00
Code Issues Releases Wiki Activity

adding tls

Browse Source
This commit is contained in:
mgerb42
2016-10-28 21:27:04 +02:00
parent 6848ddadd0
commit 9c2e7bd754
5 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -6,3 +6,5 @@ dist
public public
npm-debug.log npm-debug.log
mywebsite mywebsite
tls.key
tls.crt

9
config.template.json
View File

@@ -1,12 +1,15 @@
{ {
"database": { "Database": {
"url": "", "url": "",
"database": "", "database": "",
"username": "", "username": "",
"password": "" "password": ""
}, },
"api": { "Api": {
"key": "" "key": ""
}, },
"port": 8080 "Port": 8080,
"TLSPort": 443,
"TLSCertFile": "",
"TLSKeyFile": ""
} }

1
package.json
View File

@@ -10,6 +10,7 @@
"check-gzip-size": "gzip -9 -c ./public/client.min.js | wc -c | numfmt --to=iec-i --suffix=B --padding=10", "check-gzip-size": "gzip -9 -c ./public/client.min.js | wc -c | numfmt --to=iec-i --suffix=B --padding=10",
"deploy": "npm run get_dependencies && npm run prod && ./mywebsite", "deploy": "npm run get_dependencies && npm run prod && ./mywebsite",
"dev": "webpack-dev-server --content-base public --inline --hot --history-api-fallback", "dev": "webpack-dev-server --content-base public --inline --hot --history-api-fallback",
"generate-tls": "sudo openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout ./tls.key -out ./tls.crt",
"get_dependencies": "go get ./server && npm install", "get_dependencies": "go get ./server && npm install",
"prod": "npm run build && go build ./server/mywebsite.go", "prod": "npm run build && go build ./server/mywebsite.go",
"prod-win": "webpack -p --define process.env.NODE_ENV='\"production\"' --progress --colors && babel-node metadata.js && go build ./server/mywebsite.go", "prod-win": "webpack -p --define process.env.NODE_ENV='\"production\"' --progress --colors && babel-node metadata.js && go build ./server/mywebsite.go",

8
server/mywebsite.go
View File

@@ -24,5 +24,11 @@ func main(){
handle := gziphandler.GzipHandler(route.Routes()) handle := gziphandler.GzipHandler(route.Routes())
log.Println("Starting Server...") log.Println("Starting Server...")
log.Println(http.ListenAndServe(":"+strconv.Itoa(configurations.Port), handle)) go func(){
log.Println(http.ListenAndServe(":"+strconv.Itoa(configurations.Port), handle))
}()
if configurations.TLSCertFile != "" && configurations.TLSKeyFile != "" {
log.Println(http.ListenAndServeTLS(":"+strconv.Itoa(configurations.TLSPort), configurations.TLSCertFile, configurations.TLSKeyFile, handle))
}
} }

9
server/utils/config.go
View File

@@ -12,9 +12,12 @@ import (
//structure for application configurations //structure for application configurations
type Config struct { type Config struct {
Database db.DatabaseInfo `json:"database"` Database db.DatabaseInfo `json:"Database"`
Api api.ApiInfo `json:"api"` Api api.ApiInfo `json:"Api"`
Port int `json:"port"` Port int `json:"Port"`
TLSPort int `json:"TLSPort"`
TLSCertFile string `json:"TLSCertFile"`
TLSKeyFile string `json:"TLSKeyFile"`
} }
//read the config file and return JsonObject struct //read the config file and return JsonObject struct