ResiLien
/
nebula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds am_lighthouse warning msg (#43) 

* add warning message when am_lighthouse is enabled; update config templating
This commit is contained in:
Alan Lam 2019-11-24 09:32:08 -08:00 committed by GitHub
parent 94441789d5
commit 61d9f241b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/quickstart-vagrant/ansible/roles/nebula/templates/config.yml.j2
View File

@ -42,8 +42,10 @@ lighthouse:
am_lighthouse: false am_lighthouse: false
{% endif %} {% endif %}
interval: 60 interval: 60
{% if 'generic' in group_names %}
hosts: hosts:
- {{ hostvars[groups['lighthouse'][0]][vagrant_ifce]['ipv4']['address'] | to_nebula_ip }} - {{ hostvars[groups['lighthouse'][0]][vagrant_ifce]['ipv4']['address'] | to_nebula_ip }}
{% endif %}
# Configure the private interface # Configure the private interface
tun: tun:

7
main.go
View File

@ -188,6 +188,13 @@ func Main(configPath string, configTest bool, buildVersion string) {
punchBack := config.GetBool("punch_back", false) punchBack := config.GetBool("punch_back", false)
amLighthouse := config.GetBool("lighthouse.am_lighthouse", false) amLighthouse := config.GetBool("lighthouse.am_lighthouse", false)
// warn if am_lighthouse is enabled but upstream lighthouses exists
lighthouseHosts := config.GetStringSlice("lighthouse.hosts", []string{})
if amLighthouse && len(lighthouseHosts) != 0 {
l.Warn("lighthouse.am_lighthouse enabled on node but upstream lighthouses exist in config")
}
serveDns := config.GetBool("lighthouse.serve_dns", false) serveDns := config.GetBool("lighthouse.serve_dns", false)
lightHouse := NewLightHouse( lightHouse := NewLightHouse(
amLighthouse, amLighthouse,