changeset 473:c3125616d0ec

Make the configuration directory of fwireguard configurable
author Franz Glasner <fzglas.hg@dom66.de>
date Mon, 26 Aug 2024 17:22:26 +0200
parents 692c6357ce39
children 57f253106ed6
files Makefile files/fwireguard.in pkg-plist
diffstat 3 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Thu Aug 22 17:17:20 2024 +0200
+++ b/Makefile	Mon Aug 26 17:22:26 2024 +0200
@@ -25,7 +25,10 @@
 
 USE_RC_SUBR=	fbhyve fwireguard
 
-SUB_LIST=	SIMPLEVERSIONTAG="${SIMPLEVERSIONTAG}"
+SUB_LIST=	SIMPLEVERSIONTAG="${SIMPLEVERSIONTAG}" \
+		FWIREGUARD_ETCDIR="${FWIREGUARD_ETCDIR}"
+
+PLIST_SUB=	FWIREGUARD_ETCDIR="${FWIREGUARD_ETCDIR}"
 
 .include <bsd.port.options.mk>
 
@@ -44,6 +47,8 @@
 SIMPLEVERSIONTAG=	${PKGORIGIN} v${PKGVERSION} (rv:${HGREVISION})
 VERSIONTAG=	${PKGORIGIN} v${PKGVERSION} (rv:${HGREVISION} with repo at ${HGPATH})
 
+FWIREGUARD_ETCDIR?=	"${PREFIX}/etc/fwireguard"
+
 do-extract:
 	${MKDIR} ${WRKSRC}/bin
 	${MKDIR} ${WRKSRC}/sbin
@@ -105,6 +110,7 @@
 .for _exf in freebsd-update-ftjail-template.sh freebsd-update-ftjail.sh
 	${INSTALL_DATA} ${WRKSRC}/share/examples/${PORTNAME}/${_exf} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
+	${MKDIR} ${STAGEDIR}${FWIREGUARD_ETCDIR}
 
 post-install-DOCS-on:
 .for _mp in ${MANPAGES5:R}
--- a/files/fwireguard.in	Thu Aug 22 17:17:20 2024 +0200
+++ b/files/fwireguard.in	Mon Aug 26 17:22:26 2024 +0200
@@ -35,7 +35,7 @@
 
 : ${fwireguard_enable:="NO"}
 : ${fwireguard_wait="2s"}
-: ${fwireguard_configdir:="%%PREFIX%%/etc/fwireguard"}
+: ${fwireguard_configdir:="%%FWIREGUARD_ETCDIR%%"}
 : ${fwireguard_interfaces="AUTO"}
 
 
--- a/pkg-plist	Thu Aug 22 17:17:20 2024 +0200
+++ b/pkg-plist	Mon Aug 26 17:22:26 2024 +0200
@@ -45,3 +45,4 @@
 @sample %%ETCDIR%%/pkgtools.conf.sample
 @comment DIRECTORIES
 @dir %%ETCDIR%%
+@dir %%FWIREGUARD_ETCDIR%%