Fix dnsmasq config

entrypoint/src/cmd/entrypoint/daemon.go

@@ -71,6 +71,11 @@ func reloadBootstrap(
 	}
 
 	hostBootstrap.Hosts = newHosts
+
+	if err := writeBootstrapToDataDir(hostBootstrap); err != nil {
+		return bootstrap.Bootstrap{}, false, fmt.Errorf("writing new bootstrap to data dir: %w", err)
+	}
+
 	return hostBootstrap, true, nil
 }
 

entrypoint/src/cmd/entrypoint/daemon_util.go

@@ -15,11 +15,14 @@ func mergeDaemonConfigIntoBootstrap(
 ) (
 	bootstrap.Bootstrap, error,
 ) {
-	host := hostBootstrap.ThisHost()
 
-	host.Nebula.PublicAddr = daemonConfig.VPN.PublicAddr
-
-	host.Garage = nil
+	host := bootstrap.Host{
+		Name: hostBootstrap.HostName,
+		Nebula: bootstrap.NebulaHost{
+			SignedPublicCredentials: hostBootstrap.Nebula.SignedPublicCredentials,
+			PublicAddr:              daemonConfig.VPN.PublicAddr,
+		},
+	}
 
 	if allocs := daemonConfig.Storage.Allocations; len(allocs) > 0 {
 

entrypoint/src/dnsmasq/tpl.go

@@ -32,7 +32,7 @@ no-hosts
 user=
 group=
 
-{{- $domain := . -}}
+{{- $domain := .Domain -}}
 
 {{- range .Hosts }}
 address=/{{ .Name }}.hosts.{{ $domain }}/{{ .IP }}