howto/Bird2.md
... ...
@@ -18,6 +18,7 @@ When copying the configuration below onto your system, you will have to enter th
18 18
* Then replace `<OWNNET>` with the IPv4 subnet that was assigned to you.
19 19
* The same goes for `<OWNNETv6>`, but it takes an IPv6 subnet (Who'd have thought).
20 20
* Keep in mind that you'll have to enter both networks in the OWNNET{,v6} and OWNNETSET{,v6}, the two variables are required due to set parsing difficulties with variables.
21
+
21 22
```
22 23
################################################
23 24
# Variable header #
... ...
@@ -72,14 +73,20 @@ roa6 table dn42_roa_v6;
72 73
73 74
protocol static {
74 75
roa4 { table dn42_roa; };
75
- include "/etc/bird/roa_dn42.conf";
76
-};
77
-
78
-protocol static {
79 76
roa6 { table dn42_roa_v6; };
80
- include "/etc/bird/roa_dn42_v6.conf";
77
+ include "/etc/bird/roa_dn42_v4_and_v6.conf";
81 78
};
82 79
80
+## or use this:
81
+# protocol static {
82
+# roa4 { table dn42_roa; };
83
+# include "/etc/bird/roa_dn42.conf";
84
+# };
85
+# protocol static {
86
+# roa6 { table dn42_roa_v6; };
87
+# include "/etc/bird/roa_dn42_v6.conf";
88
+# };
89
+
83 90
function is_valid_network_v6() {
84 91
return net ~ [
85 92
fd00::/8{44,64} # ULA address space as per RFC 4193
... ...
@@ -176,11 +183,14 @@ Please note: This section assumes that you've already got a tunnel to your peeri
176 183
177 184
First, make sure the /etc/bird/peers directory exists:
178 185
179
- # mkdir -p /etc/bird/peers
186
+```
187
+# mkdir -p /etc/bird/peers
188
+```
180 189
181 190
Then for each peer, create a configuration file similar to this one:
182 191
183 192
`/etc/bird/peers/<NEIGHBOR_NAME>.conf`:
193
+
184 194
```
185 195
protocol bgp <NEIGHBOR_NAME> from dnpeers {
186 196
neighbor <NEIGHBOR_IP> as <NEIGHBOR_ASN>;