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

[tripe] / init / tripe.conf

diff --git a/init/tripe.conf b/init/tripe.conf
index daa42ad41d84a23f6ebd7e225b3c2b0b881c9a1b..743c17a61e0e060c38efa19b8beebb0f987e583e 100644 (file)
--- a/init/tripe.conf
+++ b/init/tripe.conf
@@ -49,6 +49,12 @@
 ##
 #group=tripe
 
+## The permissions to set on the administration socket.  The default is 600,
+## which allows only the configured user to connect.  Setting 660 allows
+## all members of the group to administer the server, which might be useful.
+## Setting this to 666 is probably a really bad idea.
+#sockmode=600
+
 ## Trace options to pass to tripe.  The default is no tracing.  The setting
 ## `A-cp' gives maxmimum possible verbosity without leaking important
 ## secrets.
@@ -62,12 +68,33 @@
 #miscopts=
 
 ## Logfile to write to.  The default is determined by the `--with-logfile'
-## configure option, which defaults to `./tripe.log' (relative to $TRIPEDIR).
+## configure option, which defaults to `./tripe.log' (relative to
+## $TRIPEDIR).  This may be set to `-' to write the log to stdout, or `!' to
+## write to stderr.
 ##
 #logfile=/var/log/tripe
 
+## Whether to write a log to syslog.  If this is something other than `nil',
+## then logs are written to syslog.  If `syslogp' is non-nil and `logfile'
+## above is unset then no logs are written to files.
+#syslogp=nil
+
 ## Where to put tripectl's pidfile when it starts up.  The default is
 ## determined by the `--with-pidfile' configure option, which defaults to
 ## `./tripectl.pid' (relative to $TRIPEDIR).
 ##
 #pidfile=/var/run/tripectl.pid
+
+## How to open SLIP interfaces.  The value is a sequece of zero or more
+## static allocations, followed optionally by the name of a dynamic
+## allocation script, all separated by colons.  A static allocation has the
+## form `INFD[,OUTFD]=IFNAME', declaring that the interface IFNAME can be
+## read from file descriptor INFD and written from file descriptor OUTFD
+## (defaults to the same as INFD).  The dynamic allocation script name must
+## begin with `/' or `.' (interpreted relative to $TRIPEDIR); the script must
+## write an interface name to standard output followed by a newline, and
+## thereafter speak SLIP over standard input/output; stdin will be closed
+## (and the script process sent SIGTERM) when the interface is no longer
+## needed.
+##
+#TRIPE_SLIPIF=