freifunk/puppet-ff_gw
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update bird.conf and peering data

Browse source
This commit is contained in:
ohrensessel 2014-05-20 15:54:52 +02:00
parent b9f622e589
commit 37728ec27d
2 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
data/peering.yaml
View file

@ -61,6 +61,10 @@ ic_peerings_v4:
template: peers template: peers
ip: 10.207.0.67 ip: 10.207.0.67
as: 65529 as: 65529
Bremen1:
template: peers
ip: 10.207.0.196
as: 65196
Chemnitz1: Chemnitz1:
template: peers template: peers
ip: 10.207.0.36 ip: 10.207.0.36
@ -125,9 +129,9 @@ ic_peerings_v4:
template: peers template: peers
ip: 10.207.0.66 ip: 10.207.0.66
as: 65055 as: 65055
Kiel4: Kiel2:
template: peers template: peers
ip: 10.207.0.58 ip: 10.207.0.52
as: 65525 as: 65525
Koblenz: Koblenz:
template: peers template: peers
@ -169,10 +173,6 @@ ic_peerings_v4:
template: peers template: peers
ip: 10.207.0.27 ip: 10.207.0.27
as: 65513 as: 65513
Schwarzach1:
template: peers
ip: 10.207.0.56
as: 65527
Treuenbrietzen: Treuenbrietzen:
template: peers template: peers
ip: 10.207.0.18 ip: 10.207.0.18
@ -189,6 +189,10 @@ ic_peerings_v4:
template: peers template: peers
ip: 10.207.0.7 ip: 10.207.0.7
as: 65530 as: 65530
Wermelskirchen2:
template: peers
ip: 10.207.0.8
as: 65530
peerings_v6: peerings_v6:
@ -246,6 +250,10 @@ ic_peerings_v6:
template: peers template: peers
ip: fec0::a:cf:0:60 ip: fec0::a:cf:0:60
as: 65529 as: 65529
Bremen1:
template: peers
ip: fec0::a:cf:0:c4
as: 65196
diac24: diac24:
template: peers template: peers
ip: fec0::a:cf:ac:16 ip: fec0::a:cf:ac:16
@ -302,15 +310,19 @@ ic_peerings_v6:
template: peers template: peers
ip: fec0::a:cf:0:83 ip: fec0::a:cf:0:83
as: 65052 as: 65052
Schwarzach:
template: peers
ip: fec0::a:cf:0:56
as: 65527
Weimar1: Weimar1:
template: peers template: peers
ip: fec0::a:cf:0:3 ip: fec0::a:cf:0:3
as: 65042 as: 65042
Weimar2:
template: peers
ip: fec0::a:cf:0:4
as: 65042
Wermelskirchen1: Wermelskirchen1:
template: peers template: peers
ip: fec0::a:cf:0:7 ip: fec0::a:cf:0:7
as: 65530 as: 65530
Wermelskirchen2:
template: peers
ip: fec0::a:cf:0:8
as: 65530

6
templates/etc/bird/bird.conf.erb
View file

@ -70,7 +70,7 @@ function is_chaos() {
# nothing in the other direction # nothing in the other direction
protocol kernel k_mast { protocol kernel k_mast {
scan time 10; scan time 10;
import where is_chaos(); import none;
export filter { export filter {
krt_prefsrc = <%= @own_ipv4 %>; krt_prefsrc = <%= @own_ipv4 %>;
accept; accept;
@ -163,8 +163,8 @@ template bgp peers {
table ebgp; table ebgp;
local as ownas; local as ownas;
# ignore routes for our own network # ignore routes for our own network
import where ((is_freifunk() || is_dn42() || is_chaos()) && !is_self_net()); import where ((is_freifunk() || is_dn42()) && !is_chaos() && !is_self_net());
export where (is_freifunk() || is_dn42() || is_chaos()); export where ((is_freifunk() || is_dn42()) && !is_chaos());
route limit 10000; route limit 10000;
}; };