From ccdb380b50899243d87dc70272372dfefdd1392f Mon Sep 17 00:00:00 2001
From: Malin Freeborn <malinfreeborn@posteo.net>
Date: Mon, 2 Mar 2026 17:55:15 +0100
Subject: [PATCH] generate local keys

---
 wg.mk      | 25 +++++++++++++------------
 wgkeys.rec |  7 ++++---
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/wg.mk b/wg.mk
index ce3a7c5..3d4ac3d 100644
--- a/wg.mk
+++ b/wg.mk
@@ -1,21 +1,22 @@
 public_key = $(shell cat /etc/wireguard/dmz_public_key)
 name := $(shell git config list | grep user.nam | cut -d= -f2)
 
-wgkeys.rec: /etc/wireguard/dmz_public_key
-	recins $@ -t $(basename $@) -f name -v "$(name)" -f pubkey -v "$(public_key)"
 
-/etc/wireguard/dmz.conf: xecut/nimbus/wireguard_client.conf | /etc/wireguard/dmz_private_key
-	sed 's/PRIVATE_KEY/$(shell cat $|)/' $< > $@
+# Local keys
 
-/etc/wireguard/dmz_private_key: | /bin/wg
-	$| genkey > $@
+wireguard/dmz_private_key: | /bin/wg wireguard/
+	wg genkey > $@
 	chmod 700 $@
 
-ansible/host_vars/local_host.yml: wgkeys.rec
-	recsel $< -t $(basename $<) -e 'name = "$(name)"' -P pubkey
-
-/etc/wireguard/dmz_public_key: /etc/wireguard/dmz_private_key | /bin/wg
+wireguard/dmz_public_key: wireguard/dmz_private_key | /bin/wg
 	$| pubkey < $< > $@
 
-.PHONY: wgkeys
-wgkeys: /etc/wireguard/dmz.conf ## Create dmz-keys on your machine for wiregurd.
+##############################
+
+wgkeys.rec: wireguard/dmz_public_key
+	$(info Adding wireguard key as '$(name)')
+	recins --verbose $@ -t $(basename $@) -f name -v '$(name)' -f pubkey -v '$(shell cat $<)'
+	git add $@
+	git commit -m"add wireguard key for $(name)"
+	$(info Remember to git push)
+
diff --git a/wgkeys.rec b/wgkeys.rec
index 3920857..6ec1329 100644
--- a/wgkeys.rec
+++ b/wgkeys.rec
@@ -1,7 +1,8 @@
 %rec: wgkeys
-%key: name
-%type: name line
-%mandatory: pubkey
+%type: name,pubkey line
+%mandatory: name
++ pubkey
 
 name: Malin Freeborn
 pubkey: loNnXRalD0ZyOLadSWm31rqOuRfEbgtX9O4/z7eSIho=
+