Skip to content

Commit

Permalink
make https optional (but default to on)
Browse files Browse the repository at this point in the history
Fixes #107

Signed-off-by: Will Norris <will@tailscale.com>
  • Loading branch information
willnorris committed Mar 4, 2024
1 parent 5448709 commit 0b61ec1
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion golink.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ var (
controlURL = flag.String("control-url", ipn.DefaultControlURL, "the URL base of the control plane (i.e. coordination server)")
sqlitefile = flag.String("sqlitedb", "", "path of SQLite database to store links")
dev = flag.String("dev-listen", "", "if non-empty, listen on this addr and run in dev mode; auto-set sqlitedb if empty and don't use tsnet")
useHTTPS = flag.Bool("https", true, "serve golink over HTTPS if enabled on tailnet")
snapshot = flag.String("snapshot", "", "file path of snapshot file")
hostname = flag.String("hostname", defaultHostname, "service name")
resolveFromBackup = flag.String("resolve-from-backup", "", "resolve a link from snapshot file and exit")
Expand Down Expand Up @@ -190,7 +191,7 @@ out:
if err != nil {
return err
}
enableTLS := status.Self.HasCap(tailcfg.CapabilityHTTPS) && len(srv.CertDomains()) > 0
enableTLS := *useHTTPS && status.Self.HasCap(tailcfg.CapabilityHTTPS) && len(srv.CertDomains()) > 0
fqdn := strings.TrimSuffix(status.Self.DNSName, ".")

httpHandler := serveHandler()
Expand Down

0 comments on commit 0b61ec1

Please sign in to comment.