~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server/tests.at (AWAIT_KXDONE): More warning suppressions.
[tripe]
/
init
/
tripe-init.in
diff --git
a/init/tripe-init.in
b/init/tripe-init.in
index
68f8323
..
c146bdf
100755
(executable)
--- a/
init/tripe-init.in
+++ b/
init/tripe-init.in
@@
-133,18
+133,22
@@
case "$1" in
fi
## Start the server, passing lots of arguments.
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 \
$tripectl -D -s -p$tripe \
- -f${logfile-@logfile@} \
-P$pidfile \
-P$pidfile \
- ${keytag+-S-t}$keytag \
- ${addr+-S-b}$addr \
- ${port+-S-p}${port} \
- ${user+-U}${user} \
- ${group+-G}${group} \
- ${sockmode+-m}${sockmode} \
- ${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
## Wait for the server to start up. This doesn't usually take long.
for i in 1 2 3 4 give-up; do
@@
-196,7
+200,7
@@
case "$1" in
echo -n "Stopping TrIPE VPN daemon:"
## If there's no socket, it must have quit (probably nonviolently).
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.
echo " not running"
## Ask it to die nicely.