aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristine Dodrill <me@christine.website>2017-01-27 15:57:07 -0800
committerChristine Dodrill <me@christine.website>2017-01-27 15:57:07 -0800
commitb6945edd381a7ff04eaaee7090f223ecd81ef66e (patch)
tree0d70ee6fe2451016341ffdf352554bc925f447f1
parente76391cba2196c321852437462e14893057b40b8 (diff)
downloadx-b6945edd381a7ff04eaaee7090f223ecd81ef66e.tar.xz
x-b6945edd381a7ff04eaaee7090f223ecd81ef66e.zip
svcd: listen on http too
-rw-r--r--svc/cmd/svcd/dockerswarm-svcd/.gitignore1
-rw-r--r--svc/cmd/svcd/dockerswarm-svcd/main.go4
2 files changed, 5 insertions, 0 deletions
diff --git a/svc/cmd/svcd/dockerswarm-svcd/.gitignore b/svc/cmd/svcd/dockerswarm-svcd/.gitignore
index 39305f0..5b0c5e0 100644
--- a/svc/cmd/svcd/dockerswarm-svcd/.gitignore
+++ b/svc/cmd/svcd/dockerswarm-svcd/.gitignore
@@ -1,3 +1,4 @@
state.json
dockerswarm-svcd
*.pem
+.env
diff --git a/svc/cmd/svcd/dockerswarm-svcd/main.go b/svc/cmd/svcd/dockerswarm-svcd/main.go
index bc22ec0..fda491f 100644
--- a/svc/cmd/svcd/dockerswarm-svcd/main.go
+++ b/svc/cmd/svcd/dockerswarm-svcd/main.go
@@ -10,6 +10,7 @@ import (
"io/ioutil"
"log"
"net"
+ "net/http"
"os"
"strings"
"sync"
@@ -34,6 +35,7 @@ var (
sslKey = flag.String("tls-key", "key.pem", "tls private key")
caCert = flag.String("ca-cert", "ca.pem", "ca public cert")
jwtSecret = flag.String("jwt-secret", "hunter2", "secret used to sign jwt's")
+ httpAddress = flag.String("http-listen", "127.0.0.1:9090", "tcp host:port to listen the web server on")
)
const admin = "xena"
@@ -440,6 +442,8 @@ func main() {
log.Fatal(err)
}
+ go http.ListenAndServe(*httpAddress, gs)
+
err = gs.Serve(l)
if err != nil {
log.Fatal(err)