Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 29 Jun 2020 13:32:46 +0000 (UTC)
From:      Koichiro Iwao <meta@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r540773 - in head/security/softether5: . files
Message-ID:  <202006291332.05TDWkDY032078@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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"



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