summaryrefslogtreecommitdiff
path: root/roles
diff options
context:
space:
mode:
authorNiklas Yann Wettengel <niyawe@niyawe.de>2020-02-27 17:57:17 +0100
committerNiklas Yann Wettengel <niyawe@niyawe.de>2020-02-27 17:57:17 +0100
commitd412bd90e324a7b8f18aaa47baae944089793b23 (patch)
treec7118e958cba432f5117e1218bef808edd52d005 /roles
parent02577279463123500f3900d55b23998f8379b669 (diff)
fix batctl syntax
Diffstat (limited to 'roles')
-rw-r--r--roles/install_fastd/templates/fastd_up.sh.j28
-rw-r--r--roles/install_wireguard_mesh/templates/down.sh.j22
-rw-r--r--roles/install_wireguard_mesh/templates/up.sh.j28
3 files changed, 9 insertions, 9 deletions
diff --git a/roles/install_fastd/templates/fastd_up.sh.j2 b/roles/install_fastd/templates/fastd_up.sh.j2
index 12d73dc..f056445 100644
--- a/roles/install_fastd/templates/fastd_up.sh.j2
+++ b/roles/install_fastd/templates/fastd_up.sh.j2
@@ -1,10 +1,10 @@
#!/bin/bash
ip link set address {{ item.fastd_mesh_mac }} dev $1
ip link set up dev $1
-batctl bat{{ item.name }} if add $1
-batctl bat{{ item.name }} gw server 1000000/1000000
-batctl bat{{ item.name }} it 10000
-batctl bat{{ item.name }} mm 1
+batctl meshif bat{{ item.name }} if add $1
+batctl meshif bat{{ item.name }} gw server 1000000/1000000
+batctl meshif bat{{ item.name }} it 10000
+batctl meshif bat{{ item.name }} mm 1
echo 64 > /sys/class/net/bat{{ item.name }}/mesh/hop_penalty
netctl start bat{{ item.name }}
systemctl restart dhcpd4.service
diff --git a/roles/install_wireguard_mesh/templates/down.sh.j2 b/roles/install_wireguard_mesh/templates/down.sh.j2
index 7782f0d..85489b5 100644
--- a/roles/install_wireguard_mesh/templates/down.sh.j2
+++ b/roles/install_wireguard_mesh/templates/down.sh.j2
@@ -1,7 +1,7 @@
#!/bin/bash
{% for host in groups['fastd'] %}
{% for site in hostvars[host]['sites'] if site.name == item.name and site.wireguard_mesh_number != item.wireguard_mesh_number %}
-batctl bat{{ item.name }} if del mesh{{ item.name }}{{ site.wireguard_mesh_number }}
+batctl meshif bat{{ item.name }} if del mesh{{ item.name }}{{ site.wireguard_mesh_number }}
ip link set down dev mesh{{ item.name }}{{ site.wireguard_mesh_number }}
ip link del mesh{{ item.name }}{{ site.wireguard_mesh_number }} type ip6gretap
{% endfor %}
diff --git a/roles/install_wireguard_mesh/templates/up.sh.j2 b/roles/install_wireguard_mesh/templates/up.sh.j2
index 2267f51..c336644 100644
--- a/roles/install_wireguard_mesh/templates/up.sh.j2
+++ b/roles/install_wireguard_mesh/templates/up.sh.j2
@@ -5,12 +5,12 @@ ip link add mesh{{ item.name }}{{ site.wireguard_mesh_number }} type ip6gretap r
ip link set mtu 1280 dev mesh{{ item.name }}{{ site.wireguard_mesh_number }}
ip link set address {{ item.wireguard_mesh_mac_prefix }}{{ site.wireguard_mesh_number }} dev mesh{{ item.name }}{{ site.wireguard_mesh_number }}
ip link set up dev mesh{{ item.name }}{{ site.wireguard_mesh_number }}
-batctl bat{{ item.name }} if add mesh{{ item.name }}{{ site.wireguard_mesh_number }}
+batctl meshif bat{{ item.name }} if add mesh{{ item.name }}{{ site.wireguard_mesh_number }}
{% endfor %}
{% endfor %}
-batctl bat{{ item.name }} gw server 1000000/1000000
-batctl bat{{ item.name }} it 10000
-batctl bat{{ item.name }} mm 1
+batctl meshif bat{{ item.name }} gw server 1000000/1000000
+batctl meshif bat{{ item.name }} it 10000
+batctl meshif bat{{ item.name }} mm 1
echo 64 > /sys/class/net/bat{{ item.name }}/mesh/hop_penalty
netctl start bat{{ item.name }}
systemctl restart dhcpd4.service