From 0da10ba8bc19ab889e9c4922263f36ffc220c435 Mon Sep 17 00:00:00 2001
From: Niklas Yann Wettengel <niyawe@niyawe.de>
Date: Thu, 25 Jan 2018 19:47:41 +0100
Subject: [PATCH] mullvad_uplink fix

---
 .../configure_iptables/templates/ip6tables.rules | 10 ++++++++++
 .../tasks/fastd_tasks.yml                        | 16 ++++++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/roles/configure_iptables/templates/ip6tables.rules b/roles/configure_iptables/templates/ip6tables.rules
index 913ac7c..78d76c7 100644
--- a/roles/configure_iptables/templates/ip6tables.rules
+++ b/roles/configure_iptables/templates/ip6tables.rules
@@ -14,6 +14,9 @@
 {% 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'] %}
@@ -55,16 +58,23 @@ COMMIT
 {% 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'] %}
 -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 %}
 {% 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
 {% endfor %}
 {% endif %}
 # MOSH
diff --git a/roles/install_wireguard_backbone/tasks/fastd_tasks.yml b/roles/install_wireguard_backbone/tasks/fastd_tasks.yml
index 2fe4ce6..36a61d7 100644
--- a/roles/install_wireguard_backbone/tasks/fastd_tasks.yml
+++ b/roles/install_wireguard_backbone/tasks/fastd_tasks.yml
@@ -4,21 +4,27 @@
       src: wg.conf.j2
       dest: /etc/wireguard/wgbb{{ hostvars[item]['wireguard_bb_name'] }}.conf
       mode: 0400
-  with_items: "{{ groups['ffrl_uplink'] }}"
+  with_items:
+      - "{{ groups['mullvad_uplink'] }}"
+      - "{{ groups['ffrl_uplink'] }}"
 
 - name: create wireguard up scripts for peers
   template:
       src: up.sh.j2
       dest: /etc/wireguard/upbb{{ hostvars[item]['wireguard_bb_name'] }}.sh
       mode: 0744
-  with_items: "{{ groups['ffrl_uplink'] }}"
+  with_items: 
+      - "{{ groups['mullvad_uplink'] }}"
+      - "{{ groups['ffrl_uplink'] }}"
 
 - name: create wireguard down scripts for peers
   template:
       src: down.sh.j2
       dest: /etc/wireguard/downbb{{ hostvars[item]['wireguard_bb_name'] }}.sh
       mode: 0744
-  with_items: "{{ groups['ffrl_uplink'] }}"
+  with_items: 
+      - "{{ groups['mullvad_uplink'] }}"
+      - "{{ groups['ffrl_uplink'] }}"
 
 - name: start and enable wireguard mesh
   systemd:
@@ -26,4 +32,6 @@
       enabled: yes
       state: started
       daemon_reload: yes
-  with_items: "{{ groups['ffrl_uplink'] }}"
+  with_items: 
+      - "{{ groups['mullvad_uplink'] }}"
+      - "{{ groups['ffrl_uplink'] }}"