summaryrefslogtreecommitdiff
path: root/roles
diff options
context:
space:
mode:
Diffstat (limited to 'roles')
-rw-r--r--roles/configure_iptables/templates/iptables.rules4
-rw-r--r--roles/install_fastd/templates/fastd_up.sh.j22
-rw-r--r--roles/install_wireguard_mesh/templates/down.sh.j22
3 files changed, 5 insertions, 3 deletions
diff --git a/roles/configure_iptables/templates/iptables.rules b/roles/configure_iptables/templates/iptables.rules
index 2ae5610..363958d 100644
--- a/roles/configure_iptables/templates/iptables.rules
+++ b/roles/configure_iptables/templates/iptables.rules
@@ -22,7 +22,9 @@ COMMIT
-A INPUT -p tcp -m tcp --dport 53 -j ACCEPT
-A INPUT -p udp -m udp --dport 53 -j ACCEPT
#dhcp
--I INPUT -i bat0 -p udp --dport 67:68 --sport 67:68 -j ACCEPT
+{% for site in sites %}
+-I INPUT -i bat{{ site.name }} -p udp --dport 67:68 --sport 67:68 -j ACCEPT
+{% endfor %}
# ntp
-A INPUT -p udp -m udp --dport 123 -j ACCEPT
# fastd
diff --git a/roles/install_fastd/templates/fastd_up.sh.j2 b/roles/install_fastd/templates/fastd_up.sh.j2
index 6ab39b0..7bdf06d 100644
--- a/roles/install_fastd/templates/fastd_up.sh.j2
+++ b/roles/install_fastd/templates/fastd_up.sh.j2
@@ -5,7 +5,7 @@ batctl -m bat{{ item.name }} if add $1
batctl -m bat{{ item.name }} gw server 1000000/1000000
batctl -m bat{{ item.name }} it 10000
batctl -m bat{{ item.name }} mm 1
-echo 64 > /sys/class/net/bat0/mesh/hop_penalty
+echo 64 > /sys/class/net/bat{{ item.name }}/mesh/hop_penalty
netctl start bat{{ item.name }}
systemctl restart dhcpd4.service
systemctl restart named.service
diff --git a/roles/install_wireguard_mesh/templates/down.sh.j2 b/roles/install_wireguard_mesh/templates/down.sh.j2
index 29d4fb7..603208b 100644
--- a/roles/install_wireguard_mesh/templates/down.sh.j2
+++ b/roles/install_wireguard_mesh/templates/down.sh.j2
@@ -1,6 +1,6 @@
#!/bin/bash
{% for peer in item.wireguard_mesh_peers %}
-batctl -m bat0 if del mesh{{ item.name }}{{ peer.number }}
+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 %}