server/tests.at (server retry): Use the new `WITH_STRACE' macro.

[tripe] / init / tripe-init.in

diff --git a/init/tripe-init.in b/init/tripe-init.in
index 9f44d752045239500e7f16aa1db1811c73a99f92..c146bdf9646ea57a8e458c0ddc35f262ad3c8421 100755 (executable)
--- a/init/tripe-init.in
+++ b/init/tripe-init.in
@@ -133,17 +133,22 @@ case "$1" in
     fi
 
     ## Start the server, passing lots of arguments.
+    logopt=
+    case ${syslogp-nil} in nil) ;; *) logopt="$logopt -l" ;; esac
+    case ${logfile+t},${syslogp-nil} in
+      t,*) logopt="$logopt -f$logfile" ;;
+      ,nil) logopt="$logopt -f@logfile@" ;;
+    esac
     $tripectl -D -s -p$tripe \
-      -f${logfile-@logfile@} \
       -P$pidfile \
-      ${keytag+-S-t}$keytag \
-      ${addr+-S-b}$addr \
-      ${port+-S-p}${port} \
-      ${user+-U}${user} \
-      ${group+-G}${group} \
-      ${trace+-S-T}${trace} \
-      ${tunnel+-S-n}${tunnel} \
-      ${miscopts}
+      $logopt \
+      ${keytag+-S-t$keytag} \
+      ${addr+-S-b$addr} ${port+-S-p$port} \
+      ${user+-U$user} ${group+-G$group} \
+      ${sockmode+-S-m$sockmode} \
+      ${trace+-S-T$trace} \
+      ${tunnel+-S-n$tunnel} \
+      $miscopts
 
     ## Wait for the server to start up.  This doesn't usually take long.
     for i in 1 2 3 4 give-up; do
@@ -195,7 +200,7 @@ case "$1" in
     echo -n "Stopping TrIPE VPN daemon:"
 
     ## If there's no socket, it must have quit (probably nonviolently).
-    if test ! -S $TRIPESOCK; then
+    if (cd $TRIPEDIR && test ! -S $TRIPESOCK); then
       echo " not running"
 
     ## Ask it to die nicely.