Browse Source

bird: Allow sole activation of ravd protocol.

  An empty protocol direct like

    protocol direct l3_access {
    }

  defaults to "all" interfaces, which will lead to quite a lot of
  xfer prefixes popping up in iBGP, which isn't nice.

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
Maximilian Wilhelm 6 years ago
parent
commit
51cce9c2fc
2 changed files with 2 additions and 1 deletions
  1. 1 0
      bird/ff-policy.conf
  2. 1 1
      bird/init.sls

+ 1 - 0
bird/ff-policy.conf

@@ -15,6 +15,7 @@ filter external_IPs_to_learn {
 	if net ~ [
 {%- if proto == 'v4' %}
 		80.70.181.59/32,	# mail.ffho.net
+		80.70.181.60/32,	# dns-auth.ffho.net
 		80.70.181.61/32		# fe01.ffho.net
 {%- else %}
 		2a02:450:1:0::/64	# Vega VM Subnet

+ 1 - 1
bird/init.sls

@@ -358,7 +358,7 @@ bird6-configure:
 #
 # RAdvd (for B.A.T.M.A.N. Gateways / L3-Access)
 #
-{% if ('batman_gw' in roles and grains.id.startswith('gw')) or "l3_access" in roles %}
+{% if 'radv' in roles or 'l3_access' in roles or ('batman_gw' in roles and grains.id.startswith('gw')) %}
 /etc/bird/bird6.d/radv.conf:
   file.managed:
     - source: salt://bird/radv.conf