add peer.bgp4o6 option, to support bgp multiprotocol without a v4 config-block in the peers conf

pull/1/head
n0emis 5 years ago
parent 2151b8e031
commit c54c82c709
Signed by: n0emis
GPG Key ID: 00FAF748B777CF10

@ -1,10 +1,10 @@
{% if peer.v4 is defined%} {% if peer.v4 is defined and not peer.bgp4o6 | default('false') %}
protocol bgp {{ peer.name }} from dnpeers { protocol bgp {{ peer.name }} from dnpeers {
neighbor {{ peer.v4 }} as {{ peer.as }}; neighbor {{ peer.v4 }} as {{ peer.as }};
}; };
{% endif %} {% endif %}
{% if peer.v6 is defined%} {% if peer.v6 is defined %}
protocol bgp {{ peer.name }}_v6 from dnpeers { protocol bgp {{ peer.name }}_v6 from dnpeers {
# if you use link-local ipv6 addresses for peering using the following # if you use link-local ipv6 addresses for peering using the following
neighbor {{ peer.v6 }}%{{ peer.if.name | default('dn42_' + peer.name) }} as {{ peer.as }}; neighbor {{ peer.v6 }}%{{ peer.if.name | default('dn42_' + peer.name) }} as {{ peer.as }};

@ -1,7 +1,7 @@
[Interface] [Interface]
PrivateKey = {{ peer.wg.privkey | default(dn42_wg_private_key) }} PrivateKey = {{ peer.wg.privkey | default(dn42_wg_private_key) }}
Address = {{ peer.if.v4 | default(dn42_local_v4) }}/32, {{ peer.if.v6 | default(dn42_local_v6) }}/128 Address = {{ peer.if.v4 | default(dn42_local_v4) }}/32, {{ peer.if.v6 | default(dn42_local_v6) }}/128
PostUp = {% if peer.v4 is defined %}/sbin/ip addr del dev {{ peer.if.name | default("dn42_" + peer.name) }} {{ peer.if.v4 | default(dn42_local_v4) }}/32 && /sbin/ip addr add dev {{ peer.if.name | default("dn42_" + peer.name) }} {{ peer.if.v4 | default(dn42_local_v4) }}/32 peer {{ peer.v4 }}/32 &&/ {% endif %}{% if peer.v6 is defined %}/sbin/ip addr del dev {{ peer.if.name | default("dn42_" + peer.name) }} {{ peer.if.v6 | default(dn42_local_v6) }}/128 && /sbin/ip addr add dev {{ peer.if.name | default("dn42_" + peer.name) }} {{ peer.if.v6 | default(dn42_local_v6) }}/128 peer {{ peer.v6 }}/128{% endif %} PostUp = {% if peer.v4 is defined %}/sbin/ip addr del dev {{ peer.if.name | default("dn42_" + peer.name) }} {{ peer.if.v4 | default(dn42_local_v4) }}/32 && /sbin/ip addr add dev {{ peer.if.name | default("dn42_" + peer.name) }} {{ peer.if.v4 | default(dn42_local_v4) }}/32 peer {{ peer.v4 }}/32 && {% endif %}{% if peer.v6 is defined %}/sbin/ip addr del dev {{ peer.if.name | default("dn42_" + peer.name) }} {{ peer.if.v6 | default(dn42_local_v6) }}/128 && /sbin/ip addr add dev {{ peer.if.name | default("dn42_" + peer.name) }} {{ peer.if.v6 | default(dn42_local_v6) }}/128 peer {{ peer.v6 }}/128{% endif %}
Table = off Table = off
ListenPort = {{ peer.wg.port }} ListenPort = {{ peer.wg.port }}

Loading…
Cancel
Save