cmd/tailscale: add corpDNS flag

Signed-off-by: Dmytro Shynkevych <dmytro@tailscale.com>
This commit is contained in:
Dmytro Shynkevych 2020-07-23 15:18:55 -04:00 committed by Dmytro Shynkevych
parent c53ab3111d
commit dd4e06f383

View File

@ -54,6 +54,7 @@
upf.StringVar(&upArgs.authKey, "authkey", "", "node authorization key") 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.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.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) { 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)") 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 @@
advertiseRoutes string advertiseRoutes string
advertiseTags string advertiseTags string
enableDERP bool enableDERP bool
useDNS bool
snat bool snat bool
netfilterMode string netfilterMode string
authKey string authKey string
@ -184,6 +186,7 @@ func runUp(ctx context.Context, args []string) error {
prefs.AdvertiseTags = tags prefs.AdvertiseTags = tags
prefs.NoSNAT = !upArgs.snat prefs.NoSNAT = !upArgs.snat
prefs.DisableDERP = !upArgs.enableDERP prefs.DisableDERP = !upArgs.enableDERP
prefs.CorpDNS = upArgs.useDNS
prefs.Hostname = upArgs.hostname prefs.Hostname = upArgs.hostname
if runtime.GOOS == "linux" { if runtime.GOOS == "linux" {
switch upArgs.netfilterMode { switch upArgs.netfilterMode {