interfaces: mesh_wg: fix for use with bullseye

This commit is contained in:
Markus 2021-09-27 18:14:18 +02:00
parent ef9303ecf7
commit 26bd85279c
3 changed files with 11 additions and 21 deletions

View File

@ -14,6 +14,8 @@ iface br-{{ site_code }}
{% if global_ipv6 is defined %} {% if global_ipv6 is defined %}
address {{ global_ipv6 }} address {{ global_ipv6 }}
{% endif %} {% endif %}
#
post-up echo 2 > /sys/class/net/bat-{{ site_code }}/brport/multicast_router
# bat-{{ site_code }} # bat-{{ site_code }}
auto bat-{{ site_code }} auto bat-{{ site_code }}
@ -21,16 +23,14 @@ iface bat-{{ site_code }}
hwaddress f2:00:90:00:{{ gateway_id }}:20 hwaddress f2:00:90:00:{{ gateway_id }}:20
mtu 1500 mtu 1500
# #
batman-hop-penalty 5
batman-ifaces dmy-{{ site_code }} batman-ifaces dmy-{{ site_code }}
batman-ifaces-ignore-regex .*_.* batman-ifaces-ignore-regex .*_.*
batman-multicast-mode disabled
batman-routing-algo {{ batman_algo }} batman-routing-algo {{ batman_algo }}
# #
# batman-gw-mode option seems non reliable post-up /usr/sbin/batctl meshif bat-{{ site_code }} gw server
post-up /usr/sbin/batctl -m bat-{{ site_code }} it 5000 post-up /usr/sbin/batctl meshif bat-{{ site_code }} hp 5
post-up /usr/sbin/batctl -m bat-{{ site_code }} gw server post-up /usr/sbin/batctl meshif bat-{{ site_code }} it 5000
post-up echo 2 > /sys/class/net/bat-{{ site_code }}/brport/multicast_router post-up /usr/sbin/batctl meshif bat-{{ site_code }} mff 1
# dmy-{{ site_code }} # dmy-{{ site_code }}

View File

@ -1,17 +1,7 @@
--- ---
- name: Enable backports - name: Install wireguard
apt_repository: repo='deb http://deb.debian.org/debian buster-backports main' apt: name=wireguard-tools
- name: Install kernel headers
apt: name=linux-headers-amd64
- name: Install wireguard from backports
apt:
name:
- wireguard-dkms
- wireguard-tools
default_release: buster-backports
- name: Create wireguard config directory - name: Create wireguard config directory
file: file:
@ -28,7 +18,7 @@
notify: Reload interfaces notify: Reload interfaces
- name: Install wgskex - name: Install wgskex
apt: deb=http://moepman.eu/tmp/wgskex_0.1.0_amd64.deb apt: deb=http://moepman.eu/tmp/wgskex_0.3.1-1-g8f8ef54_amd64.deb
- name: Install ping endpoint - name: Install ping endpoint
copy: src=ping dest=/var/www/html/ping copy: src=ping dest=/var/www/html/ping

View File

@ -3,11 +3,11 @@
# vx-{{ site_code }} # vx-{{ site_code }}
auto vx-{{ site_code }} auto vx-{{ site_code }}
iface vx-{{ site_code }} iface vx-{{ site_code }}
mtu 1350
vxlan-physdev wg-{{ site_code }} vxlan-physdev wg-{{ site_code }}
pre-up ip -6 link add vx-{{ site_code }} type vxlan id {{ vx_wg_vni }} local fe80::{{ gateway_id }} dev wg-{{ site_code }} noudpcsum dstport 8472 pre-up ip -6 link add vx-{{ site_code }} type vxlan id {{ vx_wg_vni }} local fe80::{{ gateway_id }} dev wg-{{ site_code }} noudpcsum dstport 8472
up ip link set vx-{{ site_code }} up up ip link set vx-{{ site_code }} up
post-up ip link set vx-{{ site_code }} mtu 1350 post-up batctl meshif bat-{{ site_code }} if add vx-{{ site_code }}
post-up batctl -m bat-{{ site_code }} if add vx-{{ site_code }}
down ip link set vx-{{ site_code }} down down ip link set vx-{{ site_code }} down
post-down ip -6 link del vx-{{ site_code }} post-down ip -6 link del vx-{{ site_code }}