diff --git a/cmd/ctrld/cli.go b/cmd/ctrld/cli.go index 5128459..b449727 100644 --- a/cmd/ctrld/cli.go +++ b/cmd/ctrld/cli.go @@ -26,16 +26,10 @@ import ( "github.com/Control-D-Inc/ctrld/internal/controld" ) -const ( - tailscaleDevName = "tailscale0" - tailscaleDNS = "100.100.100.100" -) - var ( v = viper.NewWithOptions(viper.KeyDelimiter("::")) defaultConfigWritten = false defaultConfigFile = "ctrld.toml" - tailscaleIface *net.Interface ) var basicModeFlags = []string{"listen", "primary_upstream", "secondary_upstream", "domains", "log", "cache_size"} @@ -612,9 +606,6 @@ func netIfaceFromName(ifaceName string) (*net.Interface, error) { if i.Name == ifaceName { iface = i.Interface } - if i.Name == tailscaleDevName { - tailscaleIface = i.Interface - } }) if iface == nil { return nil, errors.New("interface not found") diff --git a/cmd/ctrld/prog.go b/cmd/ctrld/prog.go index d6bcbca..8d26abe 100644 --- a/cmd/ctrld/prog.go +++ b/cmd/ctrld/prog.go @@ -46,12 +46,6 @@ func (p *prog) run() { } } } - // Sorry, tailscale! - if tailscaleIface != nil { - if err := setDNS(tailscaleIface, []string{cfg.Listener["0"].IP}); err != nil { - mainLog.Warn().Err(err).Msg("could not set DNS for tailscale interface") - } - } if p.cfg.Service.CacheEnable { cacher, err := dnscache.NewLRUCache(p.cfg.Service.CacheSize)