lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmd/derper: allow http port configuration 

Signed-off-by: Arnaud Dezandee <dezandee.arnaud@gmail.com>
pull/3534/head
Arnaud Dezandee 2021-12-06 09:28:19 +01:00 committed by Brad Fitzpatrick
parent e34ba3223c
commit 656809e4ee
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/derper/derper.go
View File

@ -12,6 +12,7 @@ import (
"errors" "errors"
"expvar" "expvar"
"flag" "flag"
"fmt"
"io" "io"
"io/ioutil" "io/ioutil"
"log" "log"
@ -36,6 +37,7 @@ import (
var ( var (
dev = flag.Bool("dev", false, "run in localhost development mode") dev = flag.Bool("dev", false, "run in localhost development mode")
addr = flag.String("a", ":443", "server address") addr = flag.String("a", ":443", "server address")
httpPort = flag.Int("http-port", 80, "The port on which to serve HTTP. Set to -1 to disable")
configPath = flag.String("c", "", "config file path") configPath = flag.String("c", "", "config file path")
certMode = flag.String("certmode", "letsencrypt", "mode for getting a cert. possible options: manual, letsencrypt") certMode = flag.String("certmode", "letsencrypt", "mode for getting a cert. possible options: manual, letsencrypt")
certDir = flag.String("certdir", tsweb.DefaultCertDir("derper-certs"), "directory to store LetsEncrypt certs, if addr's port is :443") certDir = flag.String("certdir", tsweb.DefaultCertDir("derper-certs"), "directory to store LetsEncrypt certs, if addr's port is :443")
@ -250,9 +252,10 @@ func main() {
w.Header().Set("Content-Security-Policy", "default-src 'none'; frame-ancestors 'none'; form-action 'none'; base-uri 'self'; block-all-mixed-content; plugin-types 'none'") w.Header().Set("Content-Security-Policy", "default-src 'none'; frame-ancestors 'none'; form-action 'none'; base-uri 'self'; block-all-mixed-content; plugin-types 'none'")
mux.ServeHTTP(w, r) mux.ServeHTTP(w, r)
}) })
if *httpPort > -1 {
go func() { go func() {
port80srv := &http.Server{ port80srv := &http.Server{
Addr: net.JoinHostPort(listenHost, "80"), Addr: net.JoinHostPort(listenHost, fmt.Sprintf("%d", *httpPort)),
Handler: certManager.HTTPHandler(tsweb.Port80Handler{Main: mux}), Handler: certManager.HTTPHandler(tsweb.Port80Handler{Main: mux}),
ReadTimeout: 30 * time.Second, ReadTimeout: 30 * time.Second,
// Crank up WriteTimeout a bit more than usually // Crank up WriteTimeout a bit more than usually
@ -268,6 +271,7 @@ func main() {
} }
} }
}() }()
}
err = httpsrv.ListenAndServeTLS("", "") err = httpsrv.ListenAndServeTLS("", "")
} else { } else {
log.Printf("derper: serving on %s", *addr) log.Printf("derper: serving on %s", *addr)