From nobody Sat Apr 19 07:43:53 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZfkCZ0GGrz5sy2P; Sat, 19 Apr 2025 07:43:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZfkCY4cKJz3Qkp; Sat, 19 Apr 2025 07:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745048633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bW4316V++aJQ46mS8c9R7KYZO0GxqCifcaiF89NqgXo=; b=usrFDIqxlthkUFpCBkcTHYMBQuz60Q4eCJI8bXjm2Yde8y3+pEh61/AB2z2r9hVLeCNmQ1 vXv0XayG9W/jicDVyWD/zMNdHYsmpakojJmamSNqurgqRhV/h+EYZjPwq95/b77sf/qg5E 8rbvkT9U3Y9EtGZY+CNXmT+i0xB+9/Pm4KnOq1xUEklUEx8jHmV+ZT+P1171fpSVrhoF3M Aht46ezuXZzRJqcK0smtD07a8DvId12deuWUKF3uZw4OhdCuxZd37bTI0xnuaCTa4gmBqm asDZ/gqUqnxz/5gTuqyBRBcTFIxIPlyDTDpPQwLZdXuHsxra5nC7VoSHZSnrWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745048633; a=rsa-sha256; cv=none; b=QTjSPG/F6IBtc4IRxHmmbGcXpgCJIGNyMU0K+XZLc1D+uWBoPoio0vFi2b+S3sXW6FQFtb retgBBKkZX3yPSpYL0UBGlvodAp9SqOMDvaFaqnRJM7kUpIhrkz/ajqjtWj+orJeGw7xA+ T3KlO6KA5QSlQx85hCeSUxVxTDhnfwSESK0hhsF4PHT/6UZ8OUWsXm7L870UjY9fPyIj44 Ig9AkZw3gpeq69EjtdHFUdXFP/FuGVeceKlu6xrtcxXA2MuybSylrDjdanMgwYwJUrkW2W eA+8kqu8zKY5jmlthpA4GhHb8UfAs2WLxBnBCNETjTvZ0P+gPcArIpZ9Y7bTmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745048633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bW4316V++aJQ46mS8c9R7KYZO0GxqCifcaiF89NqgXo=; b=yJTG3v1RYOl4C53UzR8FubOWFMA9Qc/a7QXgsRHfeJM7TY2xwaqPBidpo9wWrMPDUC7PcU OSnPYWjGFWGCFRlTYkHpn6u2e5C4+nTkpru1wEvu3e8eZShFJpWUM5tkl1DyiAyE9a45pH HAXhiXSvynXGLZmJ99VDqYHml/OTinyh3FcB/F8kTaVY4Q/yQrLpuSFgF7l4CteOiPup0J FeEkFzVNUyxBcy8uohwJoORaPw9lcICzEpYSCQBR/YNp9zKI1aVimTzwI0UQPtzSlU4Wcy +XQ3jpN41kL4sIBo9HvUlihS7Iqe+Fs7whbtDZh3/aE3Kqj/Mk8fdsgEHhbriQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZfkCY43tmz196y; Sat, 19 Apr 2025 07:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53J7hrxk019373; Sat, 19 Apr 2025 07:43:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53J7hrMS019370; Sat, 19 Apr 2025 07:43:53 GMT (envelope-from git) Date: Sat, 19 Apr 2025 07:43:53 GMT Message-Id: <202504190743.53J7hrMS019370@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ashish SHUKLA Subject: git: 218beea3335c - main - security/tailscale: Add telemetry opt-out to rc script List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ashish X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 218beea3335c1f426312807802f4fb53ed79f512 Auto-Submitted: auto-generated The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=218beea3335c1f426312807802f4fb53ed79f512 commit 218beea3335c1f426312807802f4fb53ed79f512 Author: Allison Reid AuthorDate: 2025-04-13 23:36:40 +0000 Commit: Ashish SHUKLA CommitDate: 2025-04-19 07:43:15 +0000 security/tailscale: Add telemetry opt-out to rc script PR: 286085 MFH: 2025Q2 --- security/tailscale/Makefile | 2 +- security/tailscale/files/tailscaled.in | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/security/tailscale/Makefile b/security/tailscale/Makefile index 6b77d1eca889..14a7539d9adc 100644 --- a/security/tailscale/Makefile +++ b/security/tailscale/Makefile @@ -1,7 +1,7 @@ PORTNAME= tailscale PORTVERSION= 1.82.0 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security net-vpn MAINTAINER= ashish@FreeBSD.org diff --git a/security/tailscale/files/tailscaled.in b/security/tailscale/files/tailscaled.in index ef6218876a10..1ffd6f41347c 100644 --- a/security/tailscale/files/tailscaled.in +++ b/security/tailscale/files/tailscaled.in @@ -21,6 +21,14 @@ # Default is "daemon". See daemon(8). # tailscaled_exitnode_enable (bool): Set it to YES to announce tailscaled as # an exit node. Default is "NO". +# tailscaled_telemetry_enable (bool): Set it to NO to disable real-time connection +# event streaming to `log.tailscale.io` for +# privacy when using alternate control planes. +# Default is "YES" because it's necessary if +# one wants technical support from Tailscale: +# https://tailscale.com/kb/1011#opting-out-of-client-logging +# tailscaled_args (str): Additional arguments to pass to tailscaled +# Default is "" (empty string). # tailscaled_up_args (str): Additional arguments to pass to tailscale up # Default is "" (empty string). # tailscaled_tun_dev (str): Set the name of the tun interface tailscaled creates. @@ -37,6 +45,8 @@ load_rc_config $name : ${tailscaled_state_dir:="/var/db/tailscale"} : ${tailscaled_port:="41641"} : ${tailscaled_exitnode_enable:="NO"} +: ${tailscaled_telemetry_enable:="YES"} +: ${tailscaled_args:=""} : ${tailscaled_up_args:=""} : ${tailscaled_tun_dev:="tailscale0"} @@ -78,7 +88,12 @@ tailscaled_start() /sbin/ifconfig ${tailscaled_tun_dev} destroy ) - /usr/sbin/daemon -f ${tailscaled_syslog_output_flags} -p ${pidfile} ${procname} -port ${tailscaled_port} -tun ${tailscaled_tun_dev} -statedir ${tailscaled_state_dir} + if ! checkyesno tailscaled_telemetry_enable; then + logger -s -t tailscale "Opting out of client logging telemetry." + tailscaled_args=" --no-logs-no-support ${tailscaled_args}" + fi + + /usr/sbin/daemon -f ${tailscaled_syslog_output_flags} -p ${pidfile} ${procname} -port ${tailscaled_port} -tun ${tailscaled_tun_dev} -statedir ${tailscaled_state_dir} ${tailscaled_args} } tailscaled_poststart()