X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/2e35470f549072426bf493c73dceff108a05f3b1..d8b106a3c886e95f1ba58a989347be984aa7682e:/contrib/tripe-upstart.in

diff --git a/contrib/tripe-upstart.in b/contrib/tripe-upstart.in
index aa6e4193..8d558f01 100644
--- 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.
+	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 \
-	  -f${logfile-/var/log/tripe.log} \
 	  -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