From owner-svn-ports-head@freebsd.org  Mon Jun 29 13:32:46 2020
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id C2988349CEA;
 Mon, 29 Jun 2020 13:32:46 +0000 (UTC)
 (envelope-from meta@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 "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 49wT264ZGBz3YdT;
 Mon, 29 Jun 2020 13:32:46 +0000 (UTC)
 (envelope-from meta@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 815248509;
 Mon, 29 Jun 2020 13:32:46 +0000 (UTC)
 (envelope-from meta@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05TDWkcL032081;
 Mon, 29 Jun 2020 13:32:46 GMT (envelope-from meta@FreeBSD.org)
Received: (from meta@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05TDWkDY032078;
 Mon, 29 Jun 2020 13:32:46 GMT (envelope-from meta@FreeBSD.org)
Message-Id: <202006291332.05TDWkDY032078@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: meta set sender to
 meta@FreeBSD.org using -f
From: Koichiro Iwao <meta@FreeBSD.org>
Date: Mon, 29 Jun 2020 13:32:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r540773 - in head/security/softether5: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: meta
X-SVN-Commit-Paths: in head/security/softether5: . files
X-SVN-Commit-Revision: 540773
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Jun 2020 13:32:46 -0000

Author: meta
Date: Mon Jun 29 13:32:45 2020
New Revision: 540773
URL: https://svnweb.freebsd.org/changeset/ports/540773

Log:
  security/softether5: Add rc script for TrafficServer

Added:
  head/security/softether5/files/softether_trafficserver.in
     - copied, changed from r540007, head/security/softether5/files/softether_server.in
Modified:
  head/security/softether5/Makefile
  head/security/softether5/files/pkg-message.in

Modified: head/security/softether5/Makefile
==============================================================================
--- head/security/softether5/Makefile	Mon Jun 29 12:39:09 2020	(r540772)
+++ head/security/softether5/Makefile	Mon Jun 29 13:32:45 2020	(r540773)
@@ -20,7 +20,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES+=		cmake:noninja compiler:c11 iconv:wchar_t \
 		localbase:ldflags ncurses readline ssl
-USE_RC_SUBR=	softether_bridge softether_client softether_server
+USE_RC_SUBR=	softether_bridge softether_client \
+		softether_server softether_trafficserver
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 

Modified: head/security/softether5/files/pkg-message.in
==============================================================================
--- head/security/softether5/files/pkg-message.in	Mon Jun 29 12:39:09 2020	(r540772)
+++ head/security/softether5/files/pkg-message.in	Mon Jun 29 13:32:45 2020	(r540773)
@@ -1,14 +1,17 @@
 [
 { type: install
   message: <<EOM
-To run softether vpn client from startup, run
+To run SoftEtherVPN client from startup, run
 sysrc softether_client_enable=yes
 
-To run softether vpn server from startup, run
+To run SoftEtherVPN server from startup, run
 sysrc softether_server_enable=yes
 
-To run softether vpn bridge from startup, run
+To run SoftEtherVPN bridge from startup, run
 sysrc softether_bridge_enable=yes
+
+To run SoftEtherVPN traffic server from startup, run
+sysrc softether_trafficserver_enable=yes
 
 Initial and further configuration of all softether services can be
 done either by using a Windows client to connect to the running

Copied and modified: head/security/softether5/files/softether_trafficserver.in (from r540007, head/security/softether5/files/softether_server.in)
==============================================================================
--- head/security/softether5/files/softether_server.in	Tue Jun 23 23:45:49 2020	(r540007, copy source)
+++ head/security/softether5/files/softether_trafficserver.in	Mon Jun 29 13:32:45 2020	(r540773)
@@ -1,36 +1,66 @@
 #!/bin/sh
 
-# PROVIDE: softether_server
+# PROVIDE: softether_trafficserver
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
 # KEYWORD: shutdown
 
 #
-# Add the following lines to /etc/rc.conf to enable softether_server:
-# softether_server_enable (bool):  Set to "NO" by default.
-#                                  Set it to "YES" to enable
+# Add the following lines to /etc/rc.conf to enable softether_trafficserver:
 #
+# softether_trafficserver_enable (bool):
+#         Set it to "YES" to enable.
+#         (default: NO)
+# softether_trafficserver_user (username):
+#         Username used to run the daemon.
+#         (default: nobody)
+# softether_trafficserver_pid (str):
+#         Path of the pid file.
+#         (default: %%SE_PIDDIR%%/trafficserver.pid)
+# softether_trafficserver_log (str):
+#         Path of the log file.
+#         (default: %%SE_LOGDIR%%/trafficserver/trafficserver.log)
+
 . /etc/rc.subr
 
-name=softether_server
-rcvar=softether_server_enable
+name=softether_trafficserver
+rcvar=softether_trafficserver_enable
 load_rc_config ${name}
 
-: ${softether_server_enable:=NO}
+: ${softether_trafficserver_enable:=NO}
+: ${softether_trafficserver_pid:="%%SE_PIDDIR%%/trafficserver.pid"}
+: ${softether_trafficserver_log:="%%SE_LOGDIR%%/trafficserver/trafficserver.log"}
+: ${softether_trafficserver_user:=nobody}
 
-command="%%PREFIX%%/libexec/softether/vpnserver/vpnserver"
+command="%%PREFIX%%/libexec/softether/vpncmd/vpncmd"
+command_args="/TOOLS /CMD:TrafficServer /NOHUP:yes"
 
-datadir="%%SE_DBDIR%%"
+logdir="%%SE_LOGDIR%%"
 
 start_precmd="${name}_precmd"
-start_cmd="${command} start"
-stop_cmd="${command} stop"
+start_cmd="${name}_start"
 
-softether_server_precmd()
+pidfile="${softether_trafficserver_pid}"
+ts_user="${softether_trafficserver_user}"
+logfile="${softether_trafficserver_log}"
+
+softether_trafficserver_precmd()
 {
-	if [ ! -d "${datadir}" ]; then
-	    mkdir -p ${datadir}
+	if [ ! -d "${logdir}/trafficserver" ]; then
+	    umask 077
+	    mkdir -p ${logdir}/trafficserver
 	fi
+}
+
+softether_trafficserver_start()
+{
+	/usr/sbin/daemon \
+		-c \
+		-t trafficserver \
+		-o "${logfile}" \
+		-p "${pidfile}" \
+		-u "${ts_user}" \
+		${command} ${command_args}
 }
 
 run_rc_command "$1"