ogb912/micromdm
1
0
Fork 0
mirror of https://github.com/micromdm/micromdm/ synced 2026-08-12 04:55:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename attribute to cover both HTTPS and HTTP (with different behavior for HTTP)

Browse Source
This commit is contained in:
Jesse Peterson
2017-03-17 21:01:13 -07:00
parent 3b98596655
commit 952fd560df
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
serve.go
View File

@@ -54,7 +54,7 @@ func serve(args []string) error {
flTLS = flagset.Bool("tls", true, "use https")
flTLSCert = flagset.String("tls-cert", "", "path to TLS certificate")
flTLSKey = flagset.String("tls-key", "", "path to TLS private key")
flHTTPSAddr = flagset.String("https-addr", ":https", "https listen address")
flHTTPAddr = flagset.String("http-addr", ":https", "http(s) listen address of mdm server. defaults to :8080 if tls is false")
flRedirAddr = flagset.String("redir-addr", ":http", "http redirect to https listen address")
)
flagset.Usage = usageFor(flagset, "micromdm serve [flags]")
@@ -131,7 +131,7 @@ func serve(args []string) error {
r.Handle("/push/{udid}", pushHandlers.PushHandler)
r.Handle("/v1/commands", commandHandlers.NewCommandHandler).Methods("POST")
srv := &http.Server{
Addr: *flHTTPSAddr,
Addr: *flHTTPAddr,
Handler: r,
ReadTimeout: 60 * time.Second,
WriteTimeout: 60 * time.Second,
@@ -158,7 +158,12 @@ func serve(args []string) error {
go func() {
logger := log.With(logger, "transport", "HTTP")
if !*flTLS {
var httpAddr = "0.0.0.0:8080"
var httpAddr string
if *flHTTPAddr == ":https" {
httpAddr = ":8080"
} else {
httpAddr = *flHTTPAddr
}
logger.Log("addr", httpAddr)
errs <- http.ListenAndServe(httpAddr, r)
return