diff --git a/bird/bird.conf b/bird/bird.conf index b0545b5..7e74b17 100644 --- a/bird/bird.conf +++ b/bird/bird.conf @@ -43,4 +43,4 @@ protocol kernel { }; include "/etc/bird/net/*.conf"; -include "/etc/bird/template/*.conf"; \ No newline at end of file +include "/etc/bird/template/include.conf"; \ No newline at end of file diff --git a/bird/template/include.conf b/bird/template/include.conf new file mode 100644 index 0000000..86d9008 --- /dev/null +++ b/bird/template/include.conf @@ -0,0 +1,7 @@ +include "/etc/bird/template/inet.conf"; +include "/etc/bird/template/inet_ixp.conf"; +include "/etc/bird/peers/inet/*"; + + +include "/etc/bird/template/unet.conf"; +include "/etc/bird/peers/unet/*.conf"; diff --git a/bird/template/inet.conf b/bird/template/inet.conf index d9dee39..6c0c5a7 100644 --- a/bird/template/inet.conf +++ b/bird/template/inet.conf @@ -91,5 +91,3 @@ template bgp tpl_inet6_ibgp { }; }; } - -include "/etc/bird/peers/inet/*"; \ No newline at end of file diff --git a/bird/template/unet.conf b/bird/template/unet.conf index fee9d3c..568d5c9 100644 --- a/bird/template/unet.conf +++ b/bird/template/unet.conf @@ -101,6 +101,4 @@ template bgp unet_ibgp { accept; }; }; -} - -include "/etc/bird/peers/unet/*.conf"; \ No newline at end of file +} \ No newline at end of file diff --git a/update.sh b/update.sh index 13adfdd..484b906 100644 --- a/update.sh +++ b/update.sh @@ -2,10 +2,12 @@ cd git clone https://git.nia.ink/brnet/bird_config.git -mv bird_config/bird/conf/inet_func.conf /etc/bird/conf/ -mv bird_config/bird/conf/inet_ixp.conf /etc/bird/conf/ -mv bird_config/bird/template/inet_ixp.conf /etc/bird/template -mv bird_config/bird/function/unet.conf /etc/bird/function +rm -rf /etc/bird/bird.conf +mv bird_config/bird/bird.conf /etc/bird + + +rm -rf /etc/bird/template +mv bird_config/bird/template /etc/bird chmod -R 755 /etc/bird