summaryrefslogtreecommitdiff
path: root/roles/install_wireguard_backbone
diff options
context:
space:
mode:
Diffstat (limited to 'roles/install_wireguard_backbone')
-rw-r--r--roles/install_wireguard_backbone/tasks/fastd_tasks.yml12
-rw-r--r--roles/install_wireguard_backbone/tasks/main.yml8
-rw-r--r--roles/install_wireguard_backbone/tasks/mullvad_uplink_tasks.yml29
-rw-r--r--roles/install_wireguard_backbone/tasks/uplink_tasks.yml (renamed from roles/install_wireguard_backbone/tasks/ffrl_uplink_tasks.yml)0
4 files changed, 6 insertions, 43 deletions
diff --git a/roles/install_wireguard_backbone/tasks/fastd_tasks.yml b/roles/install_wireguard_backbone/tasks/fastd_tasks.yml
index 36a61d7..d1d9974 100644
--- a/roles/install_wireguard_backbone/tasks/fastd_tasks.yml
+++ b/roles/install_wireguard_backbone/tasks/fastd_tasks.yml
@@ -5,8 +5,7 @@
dest: /etc/wireguard/wgbb{{ hostvars[item]['wireguard_bb_name'] }}.conf
mode: 0400
with_items:
- - "{{ groups['mullvad_uplink'] }}"
- - "{{ groups['ffrl_uplink'] }}"
+ - "{{ groups['uplink'] }}"
- name: create wireguard up scripts for peers
template:
@@ -14,8 +13,7 @@
dest: /etc/wireguard/upbb{{ hostvars[item]['wireguard_bb_name'] }}.sh
mode: 0744
with_items:
- - "{{ groups['mullvad_uplink'] }}"
- - "{{ groups['ffrl_uplink'] }}"
+ - "{{ groups['uplink'] }}"
- name: create wireguard down scripts for peers
template:
@@ -23,8 +21,7 @@
dest: /etc/wireguard/downbb{{ hostvars[item]['wireguard_bb_name'] }}.sh
mode: 0744
with_items:
- - "{{ groups['mullvad_uplink'] }}"
- - "{{ groups['ffrl_uplink'] }}"
+ - "{{ groups['uplink'] }}"
- name: start and enable wireguard mesh
systemd:
@@ -33,5 +30,4 @@
state: started
daemon_reload: yes
with_items:
- - "{{ groups['mullvad_uplink'] }}"
- - "{{ groups['ffrl_uplink'] }}"
+ - "{{ groups['uplink'] }}"
diff --git a/roles/install_wireguard_backbone/tasks/main.yml b/roles/install_wireguard_backbone/tasks/main.yml
index 8f9ca5a..9ccfe05 100644
--- a/roles/install_wireguard_backbone/tasks/main.yml
+++ b/roles/install_wireguard_backbone/tasks/main.yml
@@ -7,9 +7,5 @@
- include_tasks: fastd_tasks.yml
when: "'fastd' in group_names"
-- include_tasks: mullvad_uplink_tasks.yml
- when: "'mullvad_uplink' in group_names"
-
-- include_tasks: ffrl_uplink_tasks.yml
- when: "'ffrl_uplink' in group_names"
-
+- include_tasks: uplink_tasks.yml
+ when: "'uplink' in group_names"
diff --git a/roles/install_wireguard_backbone/tasks/mullvad_uplink_tasks.yml b/roles/install_wireguard_backbone/tasks/mullvad_uplink_tasks.yml
deleted file mode 100644
index d894758..0000000
--- a/roles/install_wireguard_backbone/tasks/mullvad_uplink_tasks.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-- name: create wireguard config for peers
- template:
- src: wg.conf.j2
- dest: /etc/wireguard/wgbb{{ hostvars[item]['wireguard_bb_name'] }}.conf
- mode: 0400
- with_items: "{{ groups['fastd'] }}"
-
-- 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['fastd'] }}"
-
-- 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['fastd'] }}"
-
-- name: start and enable wireguard mesh
- systemd:
- name: wgbackbone@{{ hostvars[item]['wireguard_bb_name'] }}.service
- enabled: yes
- state: started
- daemon_reload: yes
- with_items: "{{ groups['fastd'] }}"
diff --git a/roles/install_wireguard_backbone/tasks/ffrl_uplink_tasks.yml b/roles/install_wireguard_backbone/tasks/uplink_tasks.yml
index d894758..d894758 100644
--- a/roles/install_wireguard_backbone/tasks/ffrl_uplink_tasks.yml
+++ b/roles/install_wireguard_backbone/tasks/uplink_tasks.yml