From 8ccc5322f1fc5e0f97825bef62ebd5738f84cabe Mon Sep 17 00:00:00 2001
From: sump pump <Manevolent@users.noreply.github.com>
Date: Sat, 24 Oct 2020 20:19:54 -0600
Subject: [PATCH] Update bird.conf.tmpl

---
 bird/bird.conf.tmpl | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/bird/bird.conf.tmpl b/bird/bird.conf.tmpl
index caf5398..1344c0f 100644
--- a/bird/bird.conf.tmpl
+++ b/bird/bird.conf.tmpl
@@ -17,7 +17,7 @@ timeformat protocol     iso long; # See: https://github.com/czerwonk/bird_export
 
 # Custom routing tables
 # See: https://bird.network.cz/?get_doc&v=20&f=bird-2.html (recommended read)
-ipv4 table ${network_name:-lixonet}_v4;
+ipv4 table ${netname:-lixonet}_v4;
 roa4 table r4; # ROA RPKI
 
 # RPKI
@@ -122,7 +122,7 @@ filter kernel_export_filter_v4
 # See how dn42 does it; we're very similar: https://dn42.net/howto/Bird
 protocol static {
     ipv4 {
-        table ${network_name:-lixonet}_v4;
+        table ${netname:-lixonet}_v4;
         import all;
         export none;
     };
@@ -143,7 +143,7 @@ protocol static {
 # This prevents BGP from listening on eth0/off-network
 protocol device {
     scan time 10;       # Scan the interfaces often
-    interface "${network_name:-lixonet}" {
+    interface "${netname:-lixonet}" {
         preferred ${tinc_peer_address};
     };
 };
@@ -162,7 +162,7 @@ protocol kernel {               # Primary routing table
     persist;                # Don't remove routes on bird shutdown
     scan time 10;           # Scan kernel routing table every 10 seconds
     ipv4 {
-        table ${network_name:-lixonet}_v4;
+        table ${netname:-lixonet}_v4;
         import none;                        # Don't try to import any routes from the kernel
         export filter kernel_export_filter_v4; # Export everything we are told to the kernel
     };
@@ -170,10 +170,10 @@ protocol kernel {               # Primary routing table
 
 # BFD
 protocol bfd {
-    interface "${network_name:-lixonet}" {
-        min rx interval 1000 s;
-        min tx interval 1000 s;
-        idle tx interval 1000 s;
+    interface "${netname:-lixonet}" {
+        min rx interval 1 s;
+        min tx interval 1 s;
+        idle tx interval 5 s;
         multiplier 5;
     };
 };
@@ -200,7 +200,7 @@ template bgp lixonet_client {
 
     # BGP IPv4 channel settings
     ipv4 {
-        table ${network_name:-lixonet}_v4;
+        table ${netname:-lixonet}_v4;
 
         # Always advertise our own local address as a next hop, even in cases where the
         # current Next Hop attribute should be used unchanged.