|
|
|
@ -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 { |
|
|
|
|
|
|
|
|
|