Compare commits
No commits in common. "d916d1a6300dfbcb9e0b52c1ba4b351d6856b192" and "ffd276bd3eb1ca1d56e0cb7e60064d711e301bf4" have entirely different histories.
d916d1a630
...
ffd276bd3e
@ -71,11 +71,6 @@ 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
|
||||
}
|
||||
|
||||
|
@ -15,14 +15,11 @@ func mergeDaemonConfigIntoBootstrap(
|
||||
) (
|
||||
bootstrap.Bootstrap, error,
|
||||
) {
|
||||
host := hostBootstrap.ThisHost()
|
||||
|
||||
host := bootstrap.Host{
|
||||
Name: hostBootstrap.HostName,
|
||||
Nebula: bootstrap.NebulaHost{
|
||||
SignedPublicCredentials: hostBootstrap.Nebula.SignedPublicCredentials,
|
||||
PublicAddr: daemonConfig.VPN.PublicAddr,
|
||||
},
|
||||
}
|
||||
host.Nebula.PublicAddr = daemonConfig.VPN.PublicAddr
|
||||
|
||||
host.Garage = nil
|
||||
|
||||
if allocs := daemonConfig.Storage.Allocations; len(allocs) > 0 {
|
||||
|
||||
|
@ -32,7 +32,7 @@ no-hosts
|
||||
user=
|
||||
group=
|
||||
|
||||
{{- $domain := .Domain -}}
|
||||
{{- $domain := . -}}
|
||||
|
||||
{{- range .Hosts }}
|
||||
address=/{{ .Name }}.hosts.{{ $domain }}/{{ .IP }}
|
||||
|
Loading…
Reference in New Issue
Block a user