Merge ad9b331f32 into 3ec8868982

nebula/config.go

@@ -13,7 +13,6 @@ type config struct {
 	Logging       configLogging       `yaml:"logging"`
 	Stats         configStats         `yaml:"stats"`
 	Handshakes    configHandshakes    `yaml:"handshakes"`
-	Tunnels       configTunnels       `yaml:"tunnels"`
 	Firewall      configFirewall      `yaml:"firewall"`
 	Relay         configRelay         `yaml:"relay"`
 }
@@ -65,10 +64,6 @@ func newConfig() *config {
 			Retries:      20,
 			WaitRotation: 5,
 		},
-		Tunnels: configTunnels{
-			DropInactive:      true,
-			InactivityTimeout: "10m",
-		},
 		Firewall: configFirewall{
 			Conntrack: configConntrack{
 				TcpTimeout:     "120h",
@@ -185,11 +180,6 @@ type configHandshakes struct {
 	WaitRotation int    `yaml:"wait_rotation"`
 }
 
-type configTunnels struct {
-	DropInactive      bool   `yaml:"drop_inactive"`
-	InactivityTimeout string `yaml:"inactivity_timeout"`
-}
-
 type configFirewall struct {
 	Conntrack configConntrack      `yaml:"conntrack"`
 	Outbound  []configFirewallRule `yaml:"outbound"`