wg

3 files changed, 5 insertions, 49 deletions

diff --git a/roles/install_wireguard_backbone/tasks/main.yml b/roles/install_wireguard_backbone/tasks/main.yml
index 82c024d..9ccfe05 100644
--- a/roles/install_wireguard_backbone/tasks/main.yml
+++ b/roles/install_wireguard_backbone/tasks/main.yml
@@ -5,10 +5,7 @@
       dest: /etc/systemd/system/wgbackbone@.service
 
 - include_tasks: fastd_tasks.yml
-  when: "('fastd' in group_names)"
-
-- include_tasks: wg_tasks.yml
-  when: "('wg' in group_names)"
+  when: "'fastd' in group_names"
 
 - include_tasks: uplink_tasks.yml
   when: "'uplink' in group_names"
diff --git a/roles/install_wireguard_backbone/tasks/uplink_tasks.yml b/roles/install_wireguard_backbone/tasks/uplink_tasks.yml
index dd68c76..ea906e5 100644
--- a/roles/install_wireguard_backbone/tasks/uplink_tasks.yml
+++ b/roles/install_wireguard_backbone/tasks/uplink_tasks.yml
@@ -4,9 +4,7 @@
       src: wg.conf.j2
       dest: /etc/wireguard/wgbb{{ hostvars[item]['wireguard_bb_name'] }}.conf
       mode: 0400
-  with_items:
-    - "{{ groups['fastd'] }}"
-    - "{{ groups['wg'] }}"
+  with_items: "{{ groups['fastd'] }}"
 
 - name: create wireguard config for uplinks
   template:
@@ -27,9 +25,7 @@
       src: up.sh.j2
       dest: /etc/wireguard/upbb{{ hostvars[item]['wireguard_bb_name'] }}.sh
       mode: 0744
-  with_items:
-    - "{{ groups['fastd'] }}"
-    - "{{ groups['wg'] }}"
+  with_items: "{{ groups['fastd'] }}"
 
 - name: create wireguard up scripts for uplinks
   template:
@@ -50,9 +46,7 @@
       src: down.sh.j2
       dest: /etc/wireguard/downbb{{ hostvars[item]['wireguard_bb_name'] }}.sh
       mode: 0744
-  with_items:
-    - "{{ groups['fastd'] }}"
-    - "{{ groups['wg'] }}"
+  with_items: "{{ groups['fastd'] }}"
 
 - name: create wireguard down scripts for uplinks
   template:
@@ -74,9 +68,7 @@
       enabled: yes
       state: started
       daemon_reload: yes
-  with_items:
-    - "{{ groups['fastd'] }}"
-    - "{{ groups['wg'] }}"
+  with_items: "{{ groups['fastd'] }}"
 
 - name: start and enable wireguard mesh for uplinks
   systemd:
diff --git a/roles/install_wireguard_backbone/tasks/wg_tasks.yml b/roles/install_wireguard_backbone/tasks/wg_tasks.yml
deleted file mode 100644
index d1d9974..0000000
--- a/roles/install_wireguard_backbone/tasks/wg_tasks.yml
+++ /dev/null
@@ -1,33 +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['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['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['uplink'] }}"
-
-- 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['uplink'] }}"