diff options
| author | Niklas Yann Wettengel <niyawe@niyawe.de> | 2018-01-26 00:16:27 +0100 |
|---|---|---|
| committer | Niklas Yann Wettengel <niyawe@niyawe.de> | 2018-01-26 00:16:27 +0100 |
| commit | 8225aa0e7c76b10a4a4eec23b317545705b1bc7e (patch) | |
| tree | 55d4ee81a67f294a72c709243e5286394e36cfaa /roles/configure_iptables | |
| parent | 03eb642632602a52c91f982796ee4756ada92aa8 (diff) | |
added uplink group
Diffstat (limited to 'roles/configure_iptables')
| -rw-r--r-- | roles/configure_iptables/templates/ip6tables.rules | 26 | ||||
| -rw-r--r-- | roles/configure_iptables/templates/iptables.rules | 9 |
2 files changed, 6 insertions, 29 deletions
diff --git a/roles/configure_iptables/templates/ip6tables.rules b/roles/configure_iptables/templates/ip6tables.rules index 78d76c7..dd2d1f2 100644 --- a/roles/configure_iptables/templates/ip6tables.rules +++ b/roles/configure_iptables/templates/ip6tables.rules @@ -11,19 +11,11 @@ {% endif %} {% if 'fastd' in group_names %} -{% for peer in groups['ffrl_uplink'] %} --A PREROUTING -i bb{{ hostvars[peer]['wireguard_bb_name'] }} ! -s fe80::/64 ! -d fe80::/64 -j MARK --set-xmark 0x1/0xffffffff -{% endfor %} -{% for peer in groups['mullvad_uplink'] %} --A PREROUTING -i bb{{ hostvars[peer]['wireguard_bb_name'] }} ! -s fe80::/64 ! -d fe80::/64 -j MARK --set-xmark 0x1/0xffffffff -{% endfor %} -{% endif %} -{% if 'mullvad_uplink' in group_names %} -{% for peer in groups['fastd'] %} +{% for peer in groups['uplink'] %} -A PREROUTING -i bb{{ hostvars[peer]['wireguard_bb_name'] }} ! -s fe80::/64 ! -d fe80::/64 -j MARK --set-xmark 0x1/0xffffffff {% endfor %} {% endif %} -{% if 'ffrl_uplink' in group_names %} +{% if 'uplink' in group_names %} {% for peer in groups['fastd'] %} -A PREROUTING -i bb{{ hostvars[peer]['wireguard_bb_name'] }} ! -s fe80::/64 ! -d fe80::/64 -j MARK --set-xmark 0x1/0xffffffff {% endfor %} @@ -56,22 +48,12 @@ COMMIT {% endif %} # wireguard_backbone {% if 'fastd' in group_names %} -{% for peer in groups['ffrl_uplink'] %} --A INPUT -i bb{{ hostvars[peer]['wireguard_bb_name'] }} -p udp --dport 6696 -j ACCEPT --A INPUT -p udp --dport {{ hostvars[peer]['wireguard_bb_port'] }} -j ACCEPT -{% endfor %} -{% for peer in groups['mullvad_uplink'] %} --A INPUT -i bb{{ hostvars[peer]['wireguard_bb_name'] }} -p udp --dport 6696 -j ACCEPT --A INPUT -p udp --dport {{ hostvars[peer]['wireguard_bb_port'] }} -j ACCEPT -{% endfor %} -{% endif %} -{% if 'mullvad_uplink' in group_names %} -{% for peer in groups['fastd'] %} +{% for peer in groups['uplink'] %} -A INPUT -i bb{{ hostvars[peer]['wireguard_bb_name'] }} -p udp --dport 6696 -j ACCEPT -A INPUT -p udp --dport {{ hostvars[peer]['wireguard_bb_port'] }} -j ACCEPT {% endfor %} {% endif %} -{% if 'ffrl_uplink' in group_names %} +{% if 'uplink' in group_names %} {% for peer in groups['fastd'] %} -A INPUT -i bb{{ hostvars[peer]['wireguard_bb_name'] }} -p udp --dport 6696 -j ACCEPT -A INPUT -p udp --dport {{ hostvars[peer]['wireguard_bb_port'] }} -j ACCEPT diff --git a/roles/configure_iptables/templates/iptables.rules b/roles/configure_iptables/templates/iptables.rules index 5b5410d..d832362 100644 --- a/roles/configure_iptables/templates/iptables.rules +++ b/roles/configure_iptables/templates/iptables.rules @@ -11,16 +11,11 @@ {% endif %} {% if 'fastd' in group_names %} -{% for peer in groups['ffrl_uplink'] %} +{% for peer in groups['uplink'] %} -A PREROUTING -i bb{{ hostvars[peer]['wireguard_bb_name'] }} -j MARK --set-xmark 0x1/0xffffffff {% endfor %} {% endif %} -{% if 'mullvad_uplink' in group_names %} -{% for peer in groups['fastd'] %} --A PREROUTING -i bb{{ hostvars[peer]['wireguard_bb_name'] }} -j MARK --set-xmark 0x1/0xffffffff -{% endfor %} -{% endif %} -{% if 'ffrl_uplink' in group_names %} +{% if 'uplink' in group_names %} {% for peer in groups['fastd'] %} -A PREROUTING -i bb{{ hostvars[peer]['wireguard_bb_name'] }} -j MARK --set-xmark 0x1/0xffffffff {% endfor %} |