Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 27 Apr 2023 08:26:47 GMT
From:      Ashish SHUKLA <ashish@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 467256a89512 - 2023Q2 - security/tailscale: introduce tailscaled_state_dir rc knob
Message-ID:  <202304270826.33R8QlMl083893@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2023Q2 has been updated by ashish:

URL: https://cgit.FreeBSD.org/ports/commit/?id=467256a89512b0682b8b9367de61c08419adab84

commit 467256a89512b0682b8b9367de61c08419adab84
Author:     Christian McDonald <rcm@rcm.sh>
AuthorDate: 2023-04-18 20:51:41 +0000
Commit:     Ashish SHUKLA <ashish@FreeBSD.org>
CommitDate: 2023-04-27 08:26:09 +0000

    security/tailscale: introduce tailscaled_state_dir rc knob
    
    PR:             270921
    MFH:            2023Q2
    (cherry picked from commit 8c4c48ecd652d631f7521ea797292cb2b26709d5)
---
 security/tailscale/Makefile            | 2 +-
 security/tailscale/files/tailscaled.in | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/security/tailscale/Makefile b/security/tailscale/Makefile
index c4c5236ea699..074f6ed62ab5 100644
--- a/security/tailscale/Makefile
+++ b/security/tailscale/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	tailscale
 PORTVERSION=	1.38.4
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security net-vpn
 
diff --git a/security/tailscale/files/tailscaled.in b/security/tailscale/files/tailscaled.in
index cfa72604f5e3..ef6218876a10 100644
--- a/security/tailscale/files/tailscaled.in
+++ b/security/tailscale/files/tailscaled.in
@@ -9,6 +9,8 @@
 #
 # tailscaled_enable (bool):	Set it to YES to enable tailscaled.
 #				Default is "NO".
+# tailscaled_state_dir (str):	Set the path to use for the state directory.
+# 				Default is "/var/db/tailscale"
 # tailscaled_port (number):	Set the port to listen on for incoming VPN packets.
 #				Default is "41641".
 # tailscaled_syslog_output_enable (bool):	Set to enable syslog output.
@@ -32,6 +34,7 @@ rcvar=tailscaled_enable
 load_rc_config $name
 
 : ${tailscaled_enable:="NO"}
+: ${tailscaled_state_dir:="/var/db/tailscale"}
 : ${tailscaled_port:="41641"}
 : ${tailscaled_exitnode_enable:="NO"}
 : ${tailscaled_up_args:=""}
@@ -74,7 +77,8 @@ tailscaled_start()
 		/sbin/ifconfig ${tailscaled_tun_dev} | fgrep -qw PID ||
 		/sbin/ifconfig ${tailscaled_tun_dev} destroy
 	)
-	env CACHE_DIRECTORY=/var/db/tailscale /usr/sbin/daemon -f ${tailscaled_syslog_output_flags} -p ${pidfile} ${procname} -port ${tailscaled_port} -tun ${tailscaled_tun_dev}
+
+	/usr/sbin/daemon -f ${tailscaled_syslog_output_flags} -p ${pidfile} ${procname} -port ${tailscaled_port} -tun ${tailscaled_tun_dev} -statedir ${tailscaled_state_dir}
 }
 
 tailscaled_poststart()



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304270826.33R8QlMl083893>