From 38cfea5edd1be39a431ca12af9a26a0406d7bbe1 Mon Sep 17 00:00:00 2001
From: Patrick Spek <p.spek@tyil.nl>
Date: Thu, 7 Mar 2024 10:26:15 +0100
Subject: Fix vpn-wireguard issues introduced by making it dual-stack

---
 playbooks.d/vpn-wireguard/playbook.bash | 3 ++-
 playbooks.d/vpn-wireguard/share/peer    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/playbooks.d/vpn-wireguard/playbook.bash b/playbooks.d/vpn-wireguard/playbook.bash
index 82b7286..c78906c 100644
--- a/playbooks.d/vpn-wireguard/playbook.bash
+++ b/playbooks.d/vpn-wireguard/playbook.bash
@@ -31,7 +31,8 @@ playbook_add() {
 	# Generate the peerfile for this machine
 	file_template "peer" \
 		endpoint="$(config "$BASHTARD_PLAYBOOK.endpoint")" \
-		ip="$(config "$BASHTARD_PLAYBOOK.ip")" \
+		ipv4="$(config "$BASHTARD_PLAYBOOK.ipv4")" \
+		ipv6="$(config "$BASHTARD_PLAYBOOK.ipv6")" \
 		port="$(config "$BASHTARD_PLAYBOOK.port" "51820")" \
 		pubkey="$(wg pubkey < "$data/privkey")" \
 		> "$data/peers/${BASHTARD_PLATFORM[fqdn]}"
diff --git a/playbooks.d/vpn-wireguard/share/peer b/playbooks.d/vpn-wireguard/share/peer
index c1dde60..5dfc3dd 100644
--- a/playbooks.d/vpn-wireguard/share/peer
+++ b/playbooks.d/vpn-wireguard/share/peer
@@ -1,4 +1,4 @@
 [Peer]
-AllowedIPs = ${ip}/128
+AllowedIPs = ${ipv6}/128,${ipv4}/32
 Endpoint = [${endpoint}]:${port}
 PublicKey = ${pubkey}
-- 
cgit v1.1