freifunk/ansible-ffibk
9
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Role service-bird-ffrl: correct ipaddr filters

Browse source
This commit is contained in:
Tobias Hachmer 2017-09-17 14:53:06 +02:00
parent ce1a690db2
commit 0edd928ec8
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/service-bird-ffrl/templates/ffrl_ipv4_peers.conf.j2
View file

@ -3,7 +3,7 @@
#
{% for peer_id, peer_value in ffrl_exit_server.iteritems() %}
protocol bgp {{ peer_id }} from ffrl_uplink {
protocol bgp '{{ peer_id }}' from ffrl_uplink {
source address {{ peer_value.tunnel_ipv4_address | ipaddr('address') }};
neighbor {{ peer_value.tunnel_ipv4_network | ipaddr('address') }} as ffrl_as;
};

2
roles/service-bird-ffrl/templates/ffrl_ipv6.conf.j2
View file

@ -43,7 +43,7 @@ protocol static ffrl_public_routes {
{% for mesh_id, mesh_value in meshes.iteritems() %}
{% for prefix in mesh_value.ipv6.public %}
route {{ prefix }} reject;
route {{ prefix | ipaddr('net') | ipsubnet(56, magic) | ipaddr('network') }} reject;
route {{ prefix | ipaddr('net') | ipsubnet(56, magic) | ipaddr('network/prefix') }} reject;
{% endfor %}
{% endfor %}
}

2
roles/service-bird-ffrl/templates/ffrl_ipv6_peers.conf.j2
View file

@ -3,7 +3,7 @@
#
{% for peer_id, peer_value in ffrl_exit_server.iteritems() %}
protocol bgp {{ peer_id }} from ffrl_uplink {
protocol bgp '{{ peer_id }}' from ffrl_uplink {
source address {{ peer_value.tunnel_ipv6_network | ipaddr('net') | ipaddr('2') | ipaddr('address') }};
neighbor {{ peer_value.tunnel_ipv6_network | ipaddr('net') | ipaddr('1') | ipaddr('address') }} as ffrl_as;
};