[release] v0.10.0-unstable22
This commit is contained in:
parent
1f7c588a2b
commit
4f7421e641
|
@ -89,6 +89,9 @@ export const ConstellationVPN = () => {
|
|||
newConfig.ConstellationConfig.PrivateNode = values.PrivateNode;
|
||||
newConfig.ConstellationConfig.NebulaConfig.Relay.AMRelay = values.IsRelay;
|
||||
newConfig.ConstellationConfig.ConstellationHostname = values.ConstellationHostname;
|
||||
setTimeout(() => {
|
||||
refreshConfig();
|
||||
}, 1500);
|
||||
return API.config.set(newConfig);
|
||||
}}
|
||||
>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "cosmos-server",
|
||||
"version": "0.10.0-unstable21",
|
||||
"version": "0.10.0-unstable22",
|
||||
"description": "",
|
||||
"main": "test-server.js",
|
||||
"bugs": {
|
||||
|
|
|
@ -109,6 +109,13 @@ func ResetNebula() error {
|
|||
return err
|
||||
}
|
||||
|
||||
config := utils.ReadConfigFromFile()
|
||||
config.ConstellationConfig.Enabled = false
|
||||
config.ConstellationConfig.SlaveMode = false
|
||||
config.ConstellationConfig.DNSDisabled = false
|
||||
|
||||
utils.SetBaseMainConfig(config)
|
||||
|
||||
Init()
|
||||
|
||||
return nil
|
||||
|
@ -194,6 +201,8 @@ func ExportConfigToYAML(overwriteConfig utils.ConstellationConfig, outputPath st
|
|||
finalConfig.PKI.Blocklist = append(finalConfig.PKI.Blocklist, d.Fingerprint)
|
||||
}
|
||||
|
||||
finalConfig.Lighthouse.AMLighthouse = !overwriteConfig.PrivateNode
|
||||
|
||||
// add other lighthouses
|
||||
finalConfig.Lighthouse.Hosts = []string{}
|
||||
for _, l := range lh {
|
||||
|
@ -204,7 +213,7 @@ func ExportConfigToYAML(overwriteConfig utils.ConstellationConfig, outputPath st
|
|||
|
||||
finalConfig.Relay.Relays = []string{}
|
||||
for _, l := range lh {
|
||||
if l.IsRelay && l.IsLighthouse {
|
||||
if l.IsRelay {
|
||||
finalConfig.Relay.Relays = append(finalConfig.Relay.Relays, cleanIp(l.IP))
|
||||
}
|
||||
}
|
||||
|
@ -257,8 +266,10 @@ func getYAMLClientConfig(name, configPath, capki, cert, key, APIKey string, devi
|
|||
}
|
||||
|
||||
if staticHostMap, ok := configMap["static_host_map"].(map[interface{}]interface{}); ok {
|
||||
staticHostMap["192.168.201.1"] = []string{
|
||||
utils.GetMainConfig().ConstellationConfig.ConstellationHostname + ":4242",
|
||||
if !utils.GetMainConfig().ConstellationConfig.PrivateNode {
|
||||
staticHostMap["192.168.201.1"] = []string{
|
||||
utils.GetMainConfig().ConstellationConfig.ConstellationHostname + ":4242",
|
||||
}
|
||||
}
|
||||
|
||||
for _, l := range lh {
|
||||
|
@ -274,8 +285,9 @@ func getYAMLClientConfig(name, configPath, capki, cert, key, APIKey string, devi
|
|||
if lighthouseMap, ok := configMap["lighthouse"].(map[interface{}]interface{}); ok {
|
||||
lighthouseMap["am_lighthouse"] = device.IsLighthouse
|
||||
|
||||
lighthouseMap["hosts"] = []string{
|
||||
"192.168.201.1",
|
||||
lighthouseMap["hosts"] = []string{}
|
||||
if !utils.GetMainConfig().ConstellationConfig.PrivateNode {
|
||||
lighthouseMap["hosts"] = append(lighthouseMap["hosts"].([]string), "192.168.201.1")
|
||||
}
|
||||
|
||||
for _, l := range lh {
|
||||
|
|
Loading…
Reference in a new issue