mirror of https://github.com/slackhq/nebula.git
Remove unused config code (last edited 4yrs ago) (#938)
This commit is contained in:
parent
38e56a4858
commit
ed00f5d530
9
main.go
9
main.go
|
@ -220,11 +220,6 @@ func Main(c *config.C, configTest bool, buildVersion string, logger *logrus.Logg
|
||||||
WithField("preferredRanges", hostMap.preferredRanges).
|
WithField("preferredRanges", hostMap.preferredRanges).
|
||||||
Info("Main HostMap created")
|
Info("Main HostMap created")
|
||||||
|
|
||||||
/*
|
|
||||||
config.SetDefault("promoter.interval", 10)
|
|
||||||
go hostMap.Promoter(config.GetInt("promoter.interval"))
|
|
||||||
*/
|
|
||||||
|
|
||||||
punchy := NewPunchyFromConfig(l, c)
|
punchy := NewPunchyFromConfig(l, c)
|
||||||
lightHouse, err := NewLightHouseFromConfig(ctx, l, c, tunCidr, udpConns[0], punchy)
|
lightHouse, err := NewLightHouseFromConfig(ctx, l, c, tunCidr, udpConns[0], punchy)
|
||||||
switch {
|
switch {
|
||||||
|
@ -255,10 +250,6 @@ func Main(c *config.C, configTest bool, buildVersion string, logger *logrus.Logg
|
||||||
handshakeManager := NewHandshakeManager(l, tunCidr, preferredRanges, hostMap, lightHouse, udpConns[0], handshakeConfig)
|
handshakeManager := NewHandshakeManager(l, tunCidr, preferredRanges, hostMap, lightHouse, udpConns[0], handshakeConfig)
|
||||||
lightHouse.handshakeTrigger = handshakeManager.trigger
|
lightHouse.handshakeTrigger = handshakeManager.trigger
|
||||||
|
|
||||||
//TODO: These will be reused for psk
|
|
||||||
//handshakeMACKey := config.GetString("handshake_mac.key", "")
|
|
||||||
//handshakeAcceptedMACKeys := config.GetStringSlice("handshake_mac.accepted_keys", []string{})
|
|
||||||
|
|
||||||
serveDns := false
|
serveDns := false
|
||||||
if c.GetBool("lighthouse.serve_dns", false) {
|
if c.GetBool("lighthouse.serve_dns", false) {
|
||||||
if c.GetBool("lighthouse.am_lighthouse", false) {
|
if c.GetBool("lighthouse.am_lighthouse", false) {
|
||||||
|
|
Loading…
Reference in New Issue