From 37728ec27ddf1f23ecdc0bde53d6e61641564ca7 Mon Sep 17 00:00:00 2001
From: ohrensessel <git@leokrueger.de>
Date: Tue, 20 May 2014 15:54:52 +0200
Subject: [PATCH] Update bird.conf and peering data

---
 data/peering.yaml                | 32 ++++++++++++++++++++++----------
 templates/etc/bird/bird.conf.erb |  6 +++---
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/data/peering.yaml b/data/peering.yaml
index 202923b..79e4df1 100644
--- a/data/peering.yaml
+++ b/data/peering.yaml
@@ -61,6 +61,10 @@ ic_peerings_v4:
     template: peers
     ip: 10.207.0.67
     as: 65529
+  Bremen1:
+    template: peers
+    ip: 10.207.0.196
+    as: 65196
   Chemnitz1:
     template: peers
     ip: 10.207.0.36
@@ -125,9 +129,9 @@ ic_peerings_v4:
     template: peers
     ip: 10.207.0.66
     as: 65055
-  Kiel4:
+  Kiel2:
     template: peers
-    ip: 10.207.0.58
+    ip: 10.207.0.52
     as: 65525
   Koblenz:
     template: peers
@@ -169,10 +173,6 @@ ic_peerings_v4:
     template: peers
     ip: 10.207.0.27
     as: 65513
-  Schwarzach1:
-    template: peers
-    ip: 10.207.0.56
-    as: 65527
   Treuenbrietzen:
     template: peers
     ip: 10.207.0.18
@@ -189,6 +189,10 @@ ic_peerings_v4:
     template: peers
     ip: 10.207.0.7
     as: 65530
+  Wermelskirchen2:
+    template: peers
+    ip: 10.207.0.8
+    as: 65530
 
 
 peerings_v6:
@@ -246,6 +250,10 @@ ic_peerings_v6:
     template: peers
     ip: fec0::a:cf:0:60
     as: 65529
+  Bremen1:
+    template: peers
+    ip: fec0::a:cf:0:c4
+    as: 65196
   diac24:
     template: peers
     ip: fec0::a:cf:ac:16
@@ -302,15 +310,19 @@ ic_peerings_v6:
     template: peers
     ip: fec0::a:cf:0:83
     as: 65052
-  Schwarzach:
-    template: peers
-    ip: fec0::a:cf:0:56
-    as: 65527
   Weimar1:
     template: peers
     ip: fec0::a:cf:0:3
     as: 65042
+  Weimar2:
+    template: peers
+    ip: fec0::a:cf:0:4
+    as: 65042
   Wermelskirchen1:
     template: peers
     ip: fec0::a:cf:0:7
     as: 65530
+  Wermelskirchen2:
+    template: peers
+    ip: fec0::a:cf:0:8
+    as: 65530
diff --git a/templates/etc/bird/bird.conf.erb b/templates/etc/bird/bird.conf.erb
index 6f951f6..50e9ae5 100644
--- a/templates/etc/bird/bird.conf.erb
+++ b/templates/etc/bird/bird.conf.erb
@@ -70,7 +70,7 @@ function is_chaos() {
 # nothing in the other direction
 protocol kernel k_mast {
     scan time 10;
-    import where is_chaos();
+    import none;
     export filter {
         krt_prefsrc = <%= @own_ipv4 %>;
         accept;
@@ -163,8 +163,8 @@ template bgp peers {
   table ebgp;
   local as ownas;
   # ignore routes for our own network
-  import where ((is_freifunk() || is_dn42() || is_chaos()) && !is_self_net());
-  export where  (is_freifunk() || is_dn42() || is_chaos());
+  import where ((is_freifunk() || is_dn42()) && !is_chaos() && !is_self_net());
+  export where ((is_freifunk() || is_dn42()) && !is_chaos());
   route limit 10000;
 };