diff --git a/bird/function/dn42.conf b/bird/function/dn42.conf index cae18da..f4330b2 100644 --- a/bird/function/dn42.conf +++ b/bird/function/dn42.conf @@ -7,7 +7,7 @@ function dn42_is_valid_network() { 172.20.0.0/24{28,32}, # dn42 Anycast 172.21.0.0/24{28,32}, # dn42 Anycast 172.22.0.0/24{28,32}, # dn42 Anycast - 172.23.0.0/24{28,32}, # dn42 Anycast + 172.23.0.0/24{28,32} # dn42 Anycast ]; } @@ -17,7 +17,7 @@ function dn42_is_valid_network_v6() { ]; } -protocol pipe dn42v6_sync { +protocol pipe dn42v4_sync { table dn42v4; peer table master4; export filter { diff --git a/bird/function/unet.conf b/bird/function/unet.conf index 0d34028..6be7633 100644 --- a/bird/function/unet.conf +++ b/bird/function/unet.conf @@ -26,7 +26,8 @@ function unet_is_valid_network_v4_allnet(){ function unet_is_voalid_net_v6(){ return net ~ [ 2406:840:e600::/44{44,56}, - 2a14:7580:9600::/40{40,56} + 2a0f:1cc5:0010::/44{44,56}, + fde8:936e:ee29::/48+ ]; } diff --git a/update.sh b/update.sh new file mode 100644 index 0000000..220a124 --- /dev/null +++ b/update.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +echo "1.克隆git仓库" +cd +git clone https://git.nia.ink/brnet/bird_config.git + +echo "2.备份原有公共配置项目" +mv /etc/bird/function /etc/bird/function.bak +mv /etc/bird/net /etc/bird/net.bak + +echo "3.复制新的公共配置项目" +cp -r bird_config/bird/function/ /etc/bird/ +cp -r bird_config/bird/net/ /etc/bird/ + +echo "4.优化conf文件夹" +mv /etc/bird/conf/mynet.conf /etc/bird/conf/unet.conf +mv /etc/bird/conf/pub.conf /etc/bird/conf/inet.conf +cp bird_config/bird/conf/dn42.conf /etc/bird/conf/dn42.conf + +echo "5.修改peers文件夹" +cp -r bird_config/bird/peers/dn42/ /etc/bird/peers/ + +echo "6.修改bird.conf" +rm /etc/bird/bird.conf +cp bird_config/bird/bird.conf /etc/bird/ + +echo "7.请手动完善var.conf 确认好后重启bird" +echo "define DN42_ASN = 4242423376;" +echo "define DN42_V4_kernel = 172.20.21.2;" +echo "define DN42_V6_kernel = fde8:936e:ee29::1;"