beenull/Cosmos-Server
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[release] v0.10.0-unstable22

Browse source
This commit is contained in:
Yann Stepienik 2023-10-06 13:55:03 +01:00
parent 1f7c588a2b
commit 4f7421e641
3 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
client/src/pages/constellation/vpn.jsx
View file

@ -89,6 +89,9 @@ export const ConstellationVPN = () => {
newConfig.ConstellationConfig.PrivateNode = values.PrivateNode; newConfig.ConstellationConfig.PrivateNode = values.PrivateNode;
newConfig.ConstellationConfig.NebulaConfig.Relay.AMRelay = values.IsRelay; newConfig.ConstellationConfig.NebulaConfig.Relay.AMRelay = values.IsRelay;
newConfig.ConstellationConfig.ConstellationHostname = values.ConstellationHostname; newConfig.ConstellationConfig.ConstellationHostname = values.ConstellationHostname;
setTimeout(() => {
refreshConfig();
}, 1500);
return API.config.set(newConfig); return API.config.set(newConfig);
}} }}
> >

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "cosmos-server", "name": "cosmos-server",
"version": "0.10.0-unstable21", "version": "0.10.0-unstable22",
"description": "", "description": "",
"main": "test-server.js", "main": "test-server.js",
"bugs": { "bugs": {

24
src/constellation/nebula.go
View file

@ -108,6 +108,13 @@ func ResetNebula() error {
if err != nil { if err != nil {
return err return err
} }
config := utils.ReadConfigFromFile()
config.ConstellationConfig.Enabled = false
config.ConstellationConfig.SlaveMode = false
config.ConstellationConfig.DNSDisabled = false
utils.SetBaseMainConfig(config)
Init() Init()
@ -194,6 +201,8 @@ func ExportConfigToYAML(overwriteConfig utils.ConstellationConfig, outputPath st
finalConfig.PKI.Blocklist = append(finalConfig.PKI.Blocklist, d.Fingerprint) finalConfig.PKI.Blocklist = append(finalConfig.PKI.Blocklist, d.Fingerprint)
} }
finalConfig.Lighthouse.AMLighthouse = !overwriteConfig.PrivateNode
// add other lighthouses // add other lighthouses
finalConfig.Lighthouse.Hosts = []string{} finalConfig.Lighthouse.Hosts = []string{}
for _, l := range lh { for _, l := range lh {
@ -204,7 +213,7 @@ func ExportConfigToYAML(overwriteConfig utils.ConstellationConfig, outputPath st
finalConfig.Relay.Relays = []string{} finalConfig.Relay.Relays = []string{}
for _, l := range lh { for _, l := range lh {
if l.IsRelay && l.IsLighthouse { if l.IsRelay {
finalConfig.Relay.Relays = append(finalConfig.Relay.Relays, cleanIp(l.IP)) 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 { if staticHostMap, ok := configMap["static_host_map"].(map[interface{}]interface{}); ok {
staticHostMap["192.168.201.1"] = []string{ if !utils.GetMainConfig().ConstellationConfig.PrivateNode {
utils.GetMainConfig().ConstellationConfig.ConstellationHostname + ":4242", staticHostMap["192.168.201.1"] = []string{
utils.GetMainConfig().ConstellationConfig.ConstellationHostname + ":4242",
}
} }
for _, l := range lh { for _, l := range lh {
@ -274,10 +285,11 @@ func getYAMLClientConfig(name, configPath, capki, cert, key, APIKey string, devi
if lighthouseMap, ok := configMap["lighthouse"].(map[interface{}]interface{}); ok { if lighthouseMap, ok := configMap["lighthouse"].(map[interface{}]interface{}); ok {
lighthouseMap["am_lighthouse"] = device.IsLighthouse lighthouseMap["am_lighthouse"] = device.IsLighthouse
lighthouseMap["hosts"] = []string{ lighthouseMap["hosts"] = []string{}
"192.168.201.1", if !utils.GetMainConfig().ConstellationConfig.PrivateNode {
lighthouseMap["hosts"] = append(lighthouseMap["hosts"].([]string), "192.168.201.1")
} }
for _, l := range lh { for _, l := range lh {
if cleanIp(l.IP) != cleanIp(device.IP) { if cleanIp(l.IP) != cleanIp(device.IP) {
lighthouseMap["hosts"] = append(lighthouseMap["hosts"].([]string), cleanIp(l.IP)) lighthouseMap["hosts"] = append(lighthouseMap["hosts"].([]string), cleanIp(l.IP))