7 files changed, 22 insertions, 19 deletions
diff --git a/acme-wireguard/host_vars/acme-1/wireguard.yml b/acme-wireguard/host_vars/acme-1/wireguard.yml
index d044f69..e36d298 100644
--- a/acme-wireguard/host_vars/acme-1/wireguard.yml
+++ b/acme-wireguard/host_vars/acme-1/wireguard.yml
@@ -2,6 +2,5 @@
 link_address: 192.168.10.3
 network_cidr: 10.55.255.0/24
 wireguard_peers:
-  acme-1:
-    - acme-2.machine.acme.com
-    - acme-3.machine.acme.com
+  - acme-2.machine.acme.com
+  - acme-3.machine.acme.com
diff --git a/acme-wireguard/host_vars/acme-2/wireguard.yml b/acme-wireguard/host_vars/acme-2/wireguard.yml
index a69f2cc..3c58546 100644
--- a/acme-wireguard/host_vars/acme-2/wireguard.yml
+++ b/acme-wireguard/host_vars/acme-2/wireguard.yml
@@ -2,6 +2,5 @@
 link_address: 192.168.10.4
 network_cidr: 10.55.254.0/24
 wireguard_peers:
-  acme-2:
-    - acme-1.machine.acme.com
-    - acme-3.machine.acme.com
+  - acme-1.machine.acme.com
+  - acme-3.machine.acme.com
diff --git a/acme-wireguard/host_vars/acme-3/wireguard.yml b/acme-wireguard/host_vars/acme-3/wireguard.yml
index 9c2c1eb..7f26fe1 100644
--- a/acme-wireguard/host_vars/acme-3/wireguard.yml
+++ b/acme-wireguard/host_vars/acme-3/wireguard.yml
@@ -2,6 +2,5 @@
 link_address: 192.168.10.5
 network_cidr: 10.55.253.0/24
 wireguard_peers:
-  acme-3:
-    - acme-1.machine.acme.com
-    - acme-2.machine.acme.com
+  - acme-1.machine.acme.com
+  - acme-2.machine.acme.com
diff --git a/acme-wireguard/host_vars/ws-1/wireguard.yml b/acme-wireguard/host_vars/ws-1/wireguard.yml
index 26c1259..b917fbb 100644
--- a/acme-wireguard/host_vars/ws-1/wireguard.yml
+++ b/acme-wireguard/host_vars/ws-1/wireguard.yml
@@ -2,7 +2,6 @@
 link_address: 192.168.10.6
 network_cidr: 10.55.252.0/24
 wireguard_peers:
-  ws-1:
-    - acme-1.machine.acme.com
-    - acme-2.machine.acme.com
-    - acme-3.machine.acme.com
+  - acme-1.machine.acme.com
+  - acme-2.machine.acme.com
+  - acme-3.machine.acme.com
diff --git a/acme-wireguard/host_vars/ws-2/wireguard.yml b/acme-wireguard/host_vars/ws-2/wireguard.yml
index 0958829..f56b320 100644
--- a/acme-wireguard/host_vars/ws-2/wireguard.yml
+++ b/acme-wireguard/host_vars/ws-2/wireguard.yml
@@ -2,7 +2,6 @@
 link_address: 192.168.10.7
 network_cidr: 10.55.251.0/24
 wireguard_peers:
-  ws-2:
-    - acme-1.machine.acme.com
-    - acme-2.machine.acme.com
-    - acme-3.machine.acme.com
+  - acme-1.machine.acme.com
+  - acme-2.machine.acme.com
+  - acme-3.machine.acme.com
diff --git a/acme-wireguard/inventory.yml b/acme-wireguard/inventory.yml
index 364d472..de54c64 100644
--- a/acme-wireguard/inventory.yml
+++ b/acme-wireguard/inventory.yml
@@ -11,3 +11,11 @@ all:
       ansible_host: 
     ws-2:
       ansible_host: 
+  children:
+    wireguard_vpn0:
+      hosts:
+        acme-1:
+        acme-2:
+        acme-3:
+        ws-1:
+        ws-2:
diff --git a/acme-wireguard/wireguard-vpn0.yml b/acme-wireguard/wireguard-vpn0.yml
index a81485d..655fe19 100644
--- a/acme-wireguard/wireguard-vpn0.yml
+++ b/acme-wireguard/wireguard-vpn0.yml
@@ -1,6 +1,6 @@
-- hosts: vpn0
+- hosts: wireguard_vpn0
   roles:
     - name: wireguard
       wireguard_if: vpn0
       wireguard_listen_port: 45364
-      wireguard_address4: "{{ link_addresses[ansible_hostname] }}"
+      wireguard_address4: "{{ link_address }}"