diff options
| author | Dmytro Shynkevych <dmytro@tailscale.com> | 2020-07-23 15:18:55 -0400 |
|---|---|---|
| committer | Dmytro Shynkevych <dm.shynk@gmail.com> | 2020-07-23 15:28:53 -0400 |
| commit | dd4e06f3838612f310e91e5bce2ae05ceedd2499 (patch) | |
| tree | df0261104fb76c739e38f126d41df70e7d540a97 /cmd | |
| parent | c53ab3111dbc4272e62d93e88eec7f054848a7a7 (diff) | |
| download | tailscale-dd4e06f3838612f310e91e5bce2ae05ceedd2499.tar.xz tailscale-dd4e06f3838612f310e91e5bce2ae05ceedd2499.zip | |
cmd/tailscale: add corpDNS flag
Signed-off-by: Dmytro Shynkevych <dmytro@tailscale.com>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/tailscale/cli/up.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmd/tailscale/cli/up.go b/cmd/tailscale/cli/up.go index 4b21a277b..7f3072e29 100644 --- a/cmd/tailscale/cli/up.go +++ b/cmd/tailscale/cli/up.go @@ -54,6 +54,7 @@ specify any flags, options are reset to their default. upf.StringVar(&upArgs.authKey, "authkey", "", "node authorization key") upf.StringVar(&upArgs.hostname, "hostname", "", "hostname to use instead of the one provided by the OS") upf.BoolVar(&upArgs.enableDERP, "enable-derp", true, "enable the use of DERP servers") + upf.BoolVar(&upArgs.useDNS, "use-dns", true, "use DNS configuration from the admin panel") if runtime.GOOS == "linux" || isBSD(runtime.GOOS) { upf.StringVar(&upArgs.advertiseRoutes, "advertise-routes", "", "routes to advertise to other nodes (comma-separated, e.g. 10.0.0.0/8,192.168.0.0/24)") } @@ -74,6 +75,7 @@ var upArgs struct { advertiseRoutes string advertiseTags string enableDERP bool + useDNS bool snat bool netfilterMode string authKey string @@ -184,6 +186,7 @@ func runUp(ctx context.Context, args []string) error { prefs.AdvertiseTags = tags prefs.NoSNAT = !upArgs.snat prefs.DisableDERP = !upArgs.enableDERP + prefs.CorpDNS = upArgs.useDNS prefs.Hostname = upArgs.hostname if runtime.GOOS == "linux" { switch upArgs.netfilterMode { |