From 29ccc82581080ed2a69ccb10b7f9b4586163005b Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Wed, 10 Jan 2024 06:31:42 +0300 Subject: [PATCH] ... Signed-off-by: Alex A. Naanou --- wireguard/templates/root/Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/wireguard/templates/root/Makefile b/wireguard/templates/root/Makefile index 6e36fa7..584469f 100644 --- a/wireguard/templates/root/Makefile +++ b/wireguard/templates/root/Makefile @@ -17,13 +17,8 @@ ENDPOINT ?= ${ENDPOINT} DNS ?= ${DNS} ALLOWED_IPS ?= 0.0.0.0/0 -# XXX need to generate this... -CLIENT_IP ?= 10.42.0.1/32 -test: - $(call newIP) - %_id: @ mkdir -p $$(dirname $@) @@ -54,13 +49,13 @@ $(SERVER_CONF): $(SERVER_TPL) $(SERVER_KEY) -e 's/\$${\ENDPOINT}/$(ENDPOINT)/g' \ -e 's/\$${\ENDPOINT_PORT}/$(ENDPOINT_PORT)/g' \ -e 's/\$${\ALLOWED_IPS}/$(subst /,\/,$(ALLOWED_IPS))/g' \ - -e 's/\$${\CLIENT_IP}/$(shell ./getFreeClientIP)\/$(patsubst %/,,$(CLIENT_IP))/g' \ + -e 's/\$${\CLIENT_IP}/$(shell ./getFreeClientIP)\/$(shell echo $(CLIENT_IPS) | sed 's/.*\///')/g' \ -e 's/\$${\CLIENT_PRIVATE_KEY}/'$$(sed -e 's/\//\\\//g' "$(CLIENT_DIR)/$*_id")'/g' \ -e 's/\$${\SERVER_PUBLIC_KEY}/'$$(sed -e 's/\//\\\//g' "$(SERVER_PUBLIC_KEY)")'/g' \ > "$(CLIENT_DIR)/$*.conf" cat "$(SERVER_CLIENT_TPL)" \ | sed \ - -e 's/\$${\CLIENT_IP}/$(shell ./getFreeClientIP)\/$(patsubst %/,,$(CLIENT_IP))/g' \ + -e 's/\$${\CLIENT_IP}/$(shell ./getFreeClientIP)\/$(shell echo $(CLIENT_IPS) | sed 's/.*\///')/g' \ -e 's/\$${\ENDPOINT}/$(ENDPOINT)/g' \ -e 's/\$${\ENDPOINT_PORT}/$(ENDPOINT_PORT)/g' \ -e 's/\$${\CLIENT_PUBLIC_KEY}/'$$(sed -e 's/\//\\\//g' "$(CLIENT_DIR)/$*_id.pub")'/g' \