chiark
/
gitweb
/
~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
svc/tripe-ifup.in: Better error handling.
[tripe]
/
contrib
/
tripe-upstart.in
diff --git
a/contrib/tripe-upstart.in
b/contrib/tripe-upstart.in
index aa6e41936ef4dfc7b2e6d45d5a39712817766198..8d558f0175db44747aed8b979c1384abed07d51c 100644
(file)
--- a/
contrib/tripe-upstart.in
+++ b/
contrib/tripe-upstart.in
@@
-143,17
+143,22
@@
script
export PATH TRIPEDIR TRIPESOCK TRIPE_SLIPIF
## Start the server, passing lots of arguments.
export PATH TRIPEDIR TRIPESOCK TRIPE_SLIPIF
## 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 -s -p$tripe \
$tripectl -s -p$tripe \
- -f${logfile-/var/log/tripe.log} \
-P$pidfile \
-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
end script
end script