From afdc5fe92bee26b9c056428e09b08add81a7ba6d Mon Sep 17 00:00:00 2001 From: Niklas Yann Wettengel Date: Sun, 16 Jul 2017 13:45:52 +0200 Subject: [PATCH] wireguard_mesh: only run batctl commands if there are peers --- roles/install_wireguard_mesh/templates/down.sh.j2 | 2 ++ roles/install_wireguard_mesh/templates/up.sh.j2 | 2 ++ 2 files changed, 4 insertions(+) diff --git a/roles/install_wireguard_mesh/templates/down.sh.j2 b/roles/install_wireguard_mesh/templates/down.sh.j2 index 603208b..a1f8d52 100644 --- a/roles/install_wireguard_mesh/templates/down.sh.j2 +++ b/roles/install_wireguard_mesh/templates/down.sh.j2 @@ -1,6 +1,8 @@ #!/bin/bash +{% if item.wireguard_mesh_peers %} {% for peer in item.wireguard_mesh_peers %} batctl -m bat{{ item.name }} if del mesh{{ item.name }}{{ peer.number }} ip link set down dev mesh{{ item.name }}{{ peer.number }} ip link del mesh{{ item.name }}{{ peer.number }} type ip6gretap {% endfor %} +{% endif %} diff --git a/roles/install_wireguard_mesh/templates/up.sh.j2 b/roles/install_wireguard_mesh/templates/up.sh.j2 index cdab474..c413685 100644 --- a/roles/install_wireguard_mesh/templates/up.sh.j2 +++ b/roles/install_wireguard_mesh/templates/up.sh.j2 @@ -1,4 +1,5 @@ #!/bin/bash +{% if item.wireguard_mesh_peers %} {% for peer in item.wireguard_mesh_peers %} ip link add mesh{{ item.name }}{{ peer.number }} type ip6gretap remote {{ peer.address }} local {{ item.wireguard_mesh_address }} ttl 255 dev wg{{ item.name }} ip link set mtu 1280 dev mesh{{ item.name }}{{ peer.number }} @@ -13,3 +14,4 @@ echo 64 > /sys/class/net/bat{{ item.name }}/mesh/hop_penalty netctl start bat{{ item.name }} systemctl restart dhcpd4.service systemctl restart named.service +{% endif %}