oc

bird/first/inet.conf

@@ -0,0 +1,26 @@
+function is_self_net() {
+  return net ~ [
+    44.32.191.0/24+
+    ];
+}
+
+
+function is_self_net_v6() {
+  return net ~ [
+    2406:840:e600::/44+,
+    2a0f:1cc5:10::/44+
+    ];
+}
+
+
+function dn42_is_self_net() {
+  return net ~ [
+    172.20.21.0/26+
+  ];
+}
+
+function dn42_is_self_net_v6() {
+  return net ~ [
+    fde8:936e:ee29::/48+
+    ];
+}

bird/first/ipconfig.conf

@@ -1,18 +1,3 @@
-function is_self_net() {
-  return net ~ [
-    44.32.191.0/24
-    ];
-}
-
-
-function is_self_net_v6() {
-  return net ~ [
-    2406:840:e600::/44{44,48},
-    2a0f:1cc5:10::/44{44,48}
-    ];
-}
-
-
 function unet_is_self_net() {
   return net ~ [
     10.188.6.0/23+,
@@ -28,15 +13,3 @@ function unet_is_self_net_v6() {
     2406:840:e60e::/56
     ];
 }
-
-function dn42_is_self_net() {
-  return net ~ [
-    172.20.21.0/26+
-  ];
-}
-
-function dn42_is_self_net_v6() {
-  return net ~ [
-    fde8:936e:ee29::/48+
-    ];
-}

update.sh

@@ -3,23 +3,10 @@
 cd 
 git clone https://git.nia.ink/brnet/bird_config.git
 
-mv ./bird_config/bird/first/ /etc/bird/ -f
+mv /etc/bird/first/inet.conf /etc/bird/first/inet.conf
-rm /etc/bird/first/ipconfig.conf
-mv /etc/bird/conf/aaa_ipconfig.conf /etc/bird/first/ipconfig.conf
-
-mv /etc/bird/function/unet.conf /etc/bird/function/unet.conf.bak
-mv ./bird_config/bird/function/unet.conf /etc/bird/function/unet.conf
-
-rm /etc/bird/net/inet.conf
-mv ./bird_config/bird/net/inet.conf /etc/bird/net/inet.conf
-
-rm /etc/bird/bird.conf
-mv ./bird_config/bird/bird.conf /etc/bird/bird.conf
 
 chmod -R 755 /etc/bird
 
-birdc c
-
 cd 
 rm -rf bird_config