feat: configure magic dns suffix

internal/config/config.go

@@ -16,10 +16,24 @@ import (
 	"time"
 )
 
-var (
-	KeepAliveInterval = 1 * time.Minute
+const (
+	defaultKeepAliveInterval = 1 * time.Minute
+	defaultMagicDNSSuffix    = "ionscale.net"
 )
 
+var (
+	keepAliveInterval = defaultKeepAliveInterval
+	magicDNSSuffix    = defaultMagicDNSSuffix
+)
+
+func KeepAliveInterval() time.Duration {
+	return keepAliveInterval
+}
+
+func MagicDNSSuffix() string {
+	return magicDNSSuffix
+}
+
 func LoadConfig(path string, flagsCfg *Config) (*Config, error) {
 	cfg := defaultConfig()
 
@@ -59,6 +73,9 @@ func LoadConfig(path string, flagsCfg *Config) (*Config, error) {
 		return nil, err
 	}
 
+	keepAliveInterval = cfg.PollNet.KeepAliveInterval
+	magicDNSSuffix = cfg.DNS.MagicDNSSuffix
+
 	return cfg, nil
 }
 
@@ -79,8 +96,15 @@ func defaultConfig() *Config {
 			AcmeCA:      certmagic.LetsEncryptProductionCA,
 			AcmePath:    "./acme",
 		},
-		PollNet: PollNet{KeepAliveInterval: 1 * time.Minute},
-		Logging: Logging{Level: "info"},
+		PollNet: PollNet{
+			KeepAliveInterval: defaultKeepAliveInterval,
+		},
+		DNS: DNS{
+			MagicDNSSuffix: defaultMagicDNSSuffix,
+		},
+		Logging: Logging{
+			Level: "info",
+		},
 	}
 }
 
@@ -100,6 +124,7 @@ type Config struct {
 	Keys              Keys         `yaml:"keys,omitempty" envPrefix:"KEYS_"`
 	Database          Database     `yaml:"database,omitempty" envPrefix:"DB_"`
 	AuthProvider      AuthProvider `yaml:"auth_provider,omitempty"`
+	DNS               DNS          `yaml:"dns,omitempty"`
 	Logging           Logging      `yaml:"logging,omitempty" envPrefix:"LOGGING_"`
 }
 
@@ -143,6 +168,10 @@ type AuthProvider struct {
 	SystemAdminPolicy SystemAdminPolicy `yaml:"system_admins"`
 }
 
+type DNS struct {
+	MagicDNSSuffix string `yaml:"magic_dns_suffix"`
+}
+
 type SystemAdminPolicy struct {
 	Subs    []string `json:"subs,omitempty"`
 	Emails  []string `json:"emails,omitempty"`

internal/handlers/poll_net_map.go

@@ -114,7 +114,7 @@ func (h *PollNetMapHandler) handleUpdate(c echo.Context, binder bind.Binder, m *
 	if err != nil {
 		return err
 	}
-	keepAliveTicker := time.NewTicker(config.KeepAliveInterval)
+	keepAliveTicker := time.NewTicker(config.KeepAliveInterval())
 	syncTicker := time.NewTicker(5 * time.Second)
 
 	c.Response().WriteHeader(http.StatusOK)
@@ -355,7 +355,7 @@ func (o *OfflineTimers) scheduleOfflineMessage(tailnetID, machineID uint64) {
 		delete(o.data, machineID)
 	}
 
-	timer := time.NewTimer(config.KeepAliveInterval)
+	timer := time.NewTimer(config.KeepAliveInterval())
 	go func() {
 		<-timer.C
 		o.pubsub.Publish(tailnetID, &broker.Signal{PeerUpdated: &machineID})

internal/mapping/mapping.go

@@ -15,8 +15,6 @@ import (
 	"time"
 )
 
-const NetworkMagicDNSSuffix = "ionscale.net"
-
 func CopyViaJson[F any, T any](f F, t T) error {
 	raw, err := json.Marshal(f)
 	if err != nil {
@@ -40,19 +38,19 @@ func ToDNSConfig(tailnet *domain.Tailnet, c *domain.DNSConfig) *tailcfg.DNSConfi
 		resolvers = append(resolvers, resolver)
 	}
 
-	config := &tailcfg.DNSConfig{}
+	dnsConfig := &tailcfg.DNSConfig{}
 
 	var domains []string
 
 	if c.MagicDNS {
-		domains = append(domains, fmt.Sprintf("%s.%s", tailnetDomain, NetworkMagicDNSSuffix))
-		config.Proxied = true
+		domains = append(domains, fmt.Sprintf("%s.%s", tailnetDomain, config.MagicDNSSuffix()))
+		dnsConfig.Proxied = true
 	}
 
 	if c.OverrideLocalDNS {
-		config.Resolvers = resolvers
+		dnsConfig.Resolvers = resolvers
 	} else {
-		config.FallbackResolvers = resolvers
+		dnsConfig.FallbackResolvers = resolvers
 	}
 
 	if len(c.Routes) != 0 {
@@ -66,12 +64,12 @@ func ToDNSConfig(tailnet *domain.Tailnet, c *domain.DNSConfig) *tailcfg.DNSConfi
 			routes[r] = routeResolver
 			domains = append(domains, r)
 		}
-		config.Routes = routes
+		dnsConfig.Routes = routes
 	}
 
-	config.Domains = domains
+	dnsConfig.Domains = domains
 
-	return config
+	return dnsConfig
 }
 
 func ToNode(m *domain.Machine) (*tailcfg.Node, *tailcfg.UserProfile, error) {
@@ -143,7 +141,7 @@ func ToNode(m *domain.Machine) (*tailcfg.Node, *tailcfg.UserProfile, error) {
 	n := tailcfg.Node{
 		ID:         tailcfg.NodeID(m.ID),
 		StableID:   tailcfg.StableNodeID(strconv.FormatUint(m.ID, 10)),
-		Name:       fmt.Sprintf("%s.%s.%s.", name, sanitizedTailnetName, NetworkMagicDNSSuffix),
+		Name:       fmt.Sprintf("%s.%s.%s.", name, sanitizedTailnetName, config.MagicDNSSuffix()),
 		Key:        *nKey,
 		Machine:    *mKey,
 		DiscoKey:   discoKey,
@@ -171,7 +169,7 @@ func ToNode(m *domain.Machine) (*tailcfg.Node, *tailcfg.UserProfile, error) {
 
 	if m.LastSeen != nil {
 		l := m.LastSeen.UTC()
-		online := m.LastSeen.After(time.Now().Add(-config.KeepAliveInterval))
+		online := m.LastSeen.After(time.Now().Add(-config.KeepAliveInterval()))
 		n.LastSeen = &l
 		n.Online = &online
 	}

internal/service/dns.go

@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"github.com/bufbuild/connect-go"
 	"github.com/jsiebens/ionscale/internal/broker"
+	"github.com/jsiebens/ionscale/internal/config"
 	"github.com/jsiebens/ionscale/internal/domain"
-	"github.com/jsiebens/ionscale/internal/mapping"
 	api "github.com/jsiebens/ionscale/pkg/gen/ionscale/v1"
 	"tailscale.com/util/dnsname"
 )
@@ -26,16 +26,16 @@ func (s *Service) GetDNSConfig(ctx context.Context, req *connect.Request[api.Get
 		return nil, connect.NewError(connect.CodeNotFound, errors.New("tailnet not found"))
 	}
 
-	config := tailnet.DNSConfig
+	dnsConfig := tailnet.DNSConfig
 	tailnetDomain := dnsname.SanitizeHostname(tailnet.Name)
 
 	resp := &api.GetDNSConfigResponse{
 		Config: &api.DNSConfig{
-			MagicDns:         config.MagicDNS,
-			MagicDnsSuffix:   fmt.Sprintf("%s.%s", tailnetDomain, mapping.NetworkMagicDNSSuffix),
-			OverrideLocalDns: config.OverrideLocalDNS,
-			Nameservers:      config.Nameservers,
-			Routes:           domainRoutesToApiRoutes(config.Routes),
+			MagicDns:         dnsConfig.MagicDNS,
+			MagicDnsSuffix:   fmt.Sprintf("%s.%s", tailnetDomain, config.MagicDNSSuffix()),
+			OverrideLocalDns: dnsConfig.OverrideLocalDNS,
+			Nameservers:      dnsConfig.Nameservers,
+			Routes:           domainRoutesToApiRoutes(dnsConfig.Routes),
 		},
 	}
 

internal/service/machine.go

@@ -25,7 +25,7 @@ func (s *Service) machineToApi(m *domain.Machine) *api.Machine {
 	online := false
 	if m.LastSeen != nil {
 		lastSeen = timestamppb.New(*m.LastSeen)
-		online = m.LastSeen.After(time.Now().Add(-config.KeepAliveInterval))
+		online = m.LastSeen.After(time.Now().Add(-config.KeepAliveInterval()))
 	}
 
 	var advertisedRoutes []string