Compare commits
3 Commits
ffd276bd3e
...
d916d1a630
Author | SHA1 | Date | |
---|---|---|---|
|
d916d1a630 | ||
|
a153911948 | ||
|
0b094f057e |
@ -71,6 +71,11 @@ func reloadBootstrap(
|
|||||||
}
|
}
|
||||||
|
|
||||||
hostBootstrap.Hosts = newHosts
|
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
|
return hostBootstrap, true, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -15,11 +15,14 @@ func mergeDaemonConfigIntoBootstrap(
|
|||||||
) (
|
) (
|
||||||
bootstrap.Bootstrap, error,
|
bootstrap.Bootstrap, error,
|
||||||
) {
|
) {
|
||||||
host := hostBootstrap.ThisHost()
|
|
||||||
|
|
||||||
host.Nebula.PublicAddr = daemonConfig.VPN.PublicAddr
|
host := bootstrap.Host{
|
||||||
|
Name: hostBootstrap.HostName,
|
||||||
host.Garage = nil
|
Nebula: bootstrap.NebulaHost{
|
||||||
|
SignedPublicCredentials: hostBootstrap.Nebula.SignedPublicCredentials,
|
||||||
|
PublicAddr: daemonConfig.VPN.PublicAddr,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
if allocs := daemonConfig.Storage.Allocations; len(allocs) > 0 {
|
if allocs := daemonConfig.Storage.Allocations; len(allocs) > 0 {
|
||||||
|
|
||||||
|
@ -32,7 +32,7 @@ no-hosts
|
|||||||
user=
|
user=
|
||||||
group=
|
group=
|
||||||
|
|
||||||
{{- $domain := . -}}
|
{{- $domain := .Domain -}}
|
||||||
|
|
||||||
{{- range .Hosts }}
|
{{- range .Hosts }}
|
||||||
address=/{{ .Name }}.hosts.{{ $domain }}/{{ .IP }}
|
address=/{{ .Name }}.hosts.{{ $domain }}/{{ .IP }}
|
||||||
|
Loading…
Reference in New Issue
Block a user