Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions cmd/tailsql/tailsql.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,10 @@ func runLocalService(ctx context.Context, opts tailsql.Options, port int) error

func runTailscaleService(ctx context.Context, opts tailsql.Options) error {
tsNode := &tsnet.Server{
Dir: os.ExpandEnv(opts.StateDir),
Hostname: opts.Hostname,
Logf: logger.Discard,
Dir: os.ExpandEnv(opts.StateDir),
Hostname: opts.Hostname,
ControlURL: opts.ControlURL,
Logf: logger.Discard,
}
if flags.DebugLog {
tsNode.Logf = log.Printf
Expand Down
4 changes: 4 additions & 0 deletions server/tailsql/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ type Options struct {
// If true, serve HTTPS instead of HTTP (tsnet).
ServeHTTPS bool `json:"serveHTTPS,omitempty"`

// The URL of the coordination server to use (tsnet).
// If empty, the Tailscale default is used.
ControlURL string `json:"controlURL,omitempty"`

// If non-empty, a SQLite database URL to use for local state.
LocalState string `json:"localState,omitempty"`

Expand Down