diff --git a/bird/template/inet.conf b/bird/template/inet.conf index fc7893b..2cfba3c 100644 --- a/bird/template/inet.conf +++ b/bird/template/inet.conf @@ -66,13 +66,13 @@ template bgp tpl_inet_up { local as LOCAL_ASN; ipv4 { table inet4; - import filter_inet4_bgp_import; - export filter_inet4_bgp_export; + import filter filter_inet4_bgp_import; + export filter filter_inet4_bgp_export; }; ipv6 { table inet6; - import filter_inet6_bgp_import; - export filter_inet6_bgp_export; + import filter filter_inet6_bgp_import; + export filter filter_inet6_bgp_export; }; } @@ -81,8 +81,8 @@ template bgp tpl_inet4_up { local as LOCAL_ASN; ipv4 { table inet4; - import filter_inet4_bgp_import; - export filter_inet4_bgp_export; + import filter filter_inet4_bgp_import; + export filter filter_inet4_bgp_export; }; } @@ -91,8 +91,8 @@ template bgp tpl_inet6_up { local as LOCAL_ASN; ipv6 { table inet6; - import filter_inet6_bgp_import; - export filter_inet6_bgp_export; + import filter filter_inet6_bgp_import; + export filter filter_inet6_bgp_export; }; } @@ -105,15 +105,15 @@ template bgp tpl_inet_ibgp { table inet4; next hop self; gateway direct; - import filter_inet4_ibgp_import; - export filter_inet4_ibgp_export; + import filter filter_inet4_ibgp_import; + export filter filter_inet4_ibgp_export; }; ipv6 { table inet6; next hop self; gateway direct; - import filter_inet6_ibgp_import; - export filter_inet6_ibgp_export; + import filter filter_inet6_ibgp_import; + export filter filter_inet6_ibgp_export; }; } @@ -126,8 +126,8 @@ template bgp tpl_inet4_ibgp { table inet4; next hop self; gateway direct; - import filter_inet4_ibgp_import; - export filter_inet4_ibgp_export; + import filter filter_inet4_ibgp_import; + export filter filter_inet4_ibgp_export; }; } @@ -140,7 +140,7 @@ template bgp tpl_inet6_ibgp { table inet6; next hop self; gateway direct; - import filter_inet6_ibgp_import; - export filter_inet6_ibgp_export; + import filter filter_inet6_ibgp_import; + export filter filter_inet6_ibgp_export; }; } \ No newline at end of file diff --git a/bird/vars.conf b/bird/vars.conf index 0ad91d0..5d938ca 100644 --- a/bird/vars.conf +++ b/bird/vars.conf @@ -2,7 +2,7 @@ define LOCAL_ASN = 153376; define LOCAL_V4_kernel = 44.32.191.7; define LOCAL_V6_kernel = 2406:840:e603::1; -define DN42L_ASN = 4242423376; +define DN42_ASN = 4242423376; define DN42_V4_kernel = 172.20.21.7; define DN42_V6_kernel = fde8:936e:ee29:3000::1; diff --git a/update.sh b/update.sh index 3ae1e57..55ffd19 100644 --- a/update.sh +++ b/update.sh @@ -12,8 +12,8 @@ rm -rf /etc/bird/template/ mv ./bird_config/bird/template /etc/bird/ -f mv ./bird_config/bird/peers/dn42 /etc/bird/peers -f - -rm -rf /etc/bird/bird.conf +rm /etc/bird/conf/inet_func.conf +rm /etc/bird/bird.conf mv ./bird_config/bird/bird.conf /etc/bird/ mv ./bird_config/bird/conf/dn42.conf /etc/bird/conf mv ./bird_config/bird/conf/aaa_ipconfig.conf /etc/bird/conf