summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Manuel <nilslice@gmail.com>2017-01-04 10:33:49 -0800
committerSteve Manuel <nilslice@gmail.com>2017-01-04 10:33:49 -0800
commit0fd5dec9de3bf444647200f207239b0fc1d60f54 (patch)
tree8c775b4efa542d7eb8778a25733b9481a96a4d00
parentfc51643434c5eef8417a62b9f83fec3823c393ec (diff)
adding https_port from db to enabledev func
-rw-r--r--cmd/ponzu/main.go3
-rw-r--r--system/tls/enabledev.go5
2 files changed, 6 insertions, 2 deletions
diff --git a/cmd/ponzu/main.go b/cmd/ponzu/main.go
index b68065c..b122f7f 100644
--- a/cmd/ponzu/main.go
+++ b/cmd/ponzu/main.go
@@ -130,7 +130,8 @@ func main() {
}
serve := exec.Command("./ponzu-server",
- fmt.Sprintf("--port=%d --httpsport=%d", port, httpsport),
+ fmt.Sprintf("--port=%d", port),
+ fmt.Sprintf("--httpsport=%d", httpsport),
addTLS,
"serve",
services,
diff --git a/system/tls/enabledev.go b/system/tls/enabledev.go
index 3550fc0..48a8961 100644
--- a/system/tls/enabledev.go
+++ b/system/tls/enabledev.go
@@ -5,6 +5,8 @@ import (
"net/http"
"os"
"path/filepath"
+
+ "github.com/bosssauce/ponzu/system/db"
)
// EnableDev generates self-signed SSL certificates to use HTTPS & HTTP/2 while
@@ -25,5 +27,6 @@ func EnableDev() {
cert := filepath.Join(vendorPath, "devcerts", "cert.pem")
key := filepath.Join(vendorPath, "devcerts", "key.pem")
- log.Fatalln(http.ListenAndServeTLS(":10443", cert, key, nil))
+ port := db.ConfigCache("https_port")
+ log.Fatalln(http.ListenAndServeTLS(":"+port, cert, key, nil))
}