6 files changed, 70 insertions, 16 deletions
diff --git a/acme-wireguard/host_vars/acme-1/wireguard.yml b/acme-wireguard/host_vars/acme-1/wireguard.yml
index e36d298..3c71e52 100644
--- a/acme-wireguard/host_vars/acme-1/wireguard.yml
+++ b/acme-wireguard/host_vars/acme-1/wireguard.yml
@@ -1,6 +1,15 @@
 # Generated
+wireguard_port: 53476
 link_address: 192.168.10.3
 network_cidr: 10.55.255.0/24
 wireguard_peers:
-  - acme-2.machine.acme.com
-  - acme-3.machine.acme.com
+  acme-2:
+    public_address: acme-2.machine.acme.com
+    public_port: 53476
+    gateway: 192.168.10.4
+    network: 10.55.254.0/24
+  acme-3:
+    public_address: acme-3.machine.acme.com
+    public_port: 53476
+    gateway: 192.168.10.5
+    network: 10.55.253.0/24
diff --git a/acme-wireguard/host_vars/acme-2/wireguard.yml b/acme-wireguard/host_vars/acme-2/wireguard.yml
index 3c58546..d7e4219 100644
--- a/acme-wireguard/host_vars/acme-2/wireguard.yml
+++ b/acme-wireguard/host_vars/acme-2/wireguard.yml
@@ -1,6 +1,15 @@
 # Generated
+wireguard_port: 53476
 link_address: 192.168.10.4
 network_cidr: 10.55.254.0/24
 wireguard_peers:
-  - acme-1.machine.acme.com
-  - acme-3.machine.acme.com
+  acme-1:
+    public_address: acme-1.machine.acme.com
+    public_port: 53476
+    gateway: 192.168.10.3
+    network: 10.55.255.0/24
+  acme-3:
+    public_address: acme-3.machine.acme.com
+    public_port: 53476
+    gateway: 192.168.10.5
+    network: 10.55.253.0/24
diff --git a/acme-wireguard/host_vars/acme-3/wireguard.yml b/acme-wireguard/host_vars/acme-3/wireguard.yml
index 7f26fe1..7d7fa76 100644
--- a/acme-wireguard/host_vars/acme-3/wireguard.yml
+++ b/acme-wireguard/host_vars/acme-3/wireguard.yml
@@ -1,6 +1,15 @@
 # Generated
+wireguard_port: 53476
 link_address: 192.168.10.5
 network_cidr: 10.55.253.0/24
 wireguard_peers:
-  - acme-1.machine.acme.com
-  - acme-2.machine.acme.com
+  acme-1:
+    public_address: acme-1.machine.acme.com
+    public_port: 53476
+    gateway: 192.168.10.3
+    network: 10.55.255.0/24
+  acme-2:
+    public_address: acme-2.machine.acme.com
+    public_port: 53476
+    gateway: 192.168.10.4
+    network: 10.55.254.0/24
diff --git a/acme-wireguard/host_vars/ws-1/wireguard.yml b/acme-wireguard/host_vars/ws-1/wireguard.yml
index b917fbb..0372db8 100644
--- a/acme-wireguard/host_vars/ws-1/wireguard.yml
+++ b/acme-wireguard/host_vars/ws-1/wireguard.yml
@@ -1,7 +1,20 @@
 # Generated
+wireguard_port: 53476
 link_address: 192.168.10.6
 network_cidr: 10.55.252.0/24
 wireguard_peers:
-  - acme-1.machine.acme.com
-  - acme-2.machine.acme.com
-  - acme-3.machine.acme.com
+  acme-1:
+    public_address: acme-1.machine.acme.com
+    public_port: 53476
+    gateway: 192.168.10.3
+    network: 10.55.255.0/24
+  acme-2:
+    public_address: acme-2.machine.acme.com
+    public_port: 53476
+    gateway: 192.168.10.4
+    network: 10.55.254.0/24
+  acme-3:
+    public_address: acme-3.machine.acme.com
+    public_port: 53476
+    gateway: 192.168.10.5
+    network: 10.55.253.0/24
diff --git a/acme-wireguard/host_vars/ws-2/wireguard.yml b/acme-wireguard/host_vars/ws-2/wireguard.yml
index f56b320..133bd66 100644
--- a/acme-wireguard/host_vars/ws-2/wireguard.yml
+++ b/acme-wireguard/host_vars/ws-2/wireguard.yml
@@ -1,7 +1,20 @@
 # Generated
+wireguard_port: 53476
 link_address: 192.168.10.7
 network_cidr: 10.55.251.0/24
 wireguard_peers:
-  - acme-1.machine.acme.com
-  - acme-2.machine.acme.com
-  - acme-3.machine.acme.com
+  acme-1:
+    public_address: acme-1.machine.acme.com
+    public_port: 53476
+    gateway: 192.168.10.3
+    network: 10.55.255.0/24
+  acme-2:
+    public_address: acme-2.machine.acme.com
+    public_port: 53476
+    gateway: 192.168.10.4
+    network: 10.55.254.0/24
+  acme-3:
+    public_address: acme-3.machine.acme.com
+    public_port: 53476
+    gateway: 192.168.10.5
+    network: 10.55.253.0/24
diff --git a/acme-wireguard/wireguard-vpn0.yml b/acme-wireguard/wireguard-vpn0.yml
index 655fe19..a1309e2 100644
--- a/acme-wireguard/wireguard-vpn0.yml
+++ b/acme-wireguard/wireguard-vpn0.yml
@@ -1,6 +1,7 @@
 - hosts: wireguard_vpn0
-  roles:
+  vars:
+    wireguard_if: vpn0
+  tasks:
     - name: wireguard
-      wireguard_if: vpn0
-      wireguard_listen_port: 45364
-      wireguard_address4: "{{ link_address }}"
+      import_role:
+        name: wireguard