lib/configuration.c, lib/home.c: Introduce environment variables.

[disorder] / doc / disorderd.8.in

diff --git a/doc/disorderd.8.in b/doc/disorderd.8.in
index a575c5852f9c562ebe42044da890550102324164..4673252af997f3636805d4647bbe8a508194761c 100644 (file)
--- a/doc/disorderd.8.in
+++ b/doc/disorderd.8.in
@@ -29,6 +29,9 @@ concerning what is to be played.
 .B \-\-config \fIPATH\fR, \fB\-c \fIPATH
 Set the configuration file.
 The default is
+given by the
+.B DISORDER_CONFIG
+environment variable, defaulting to
 .IR pkgconfdir/config .
 See
 .BR disorder_config (5)
@@ -112,6 +115,11 @@ automatically, and thus has relatively modest storage requirements.
 .TP 8
 .B SIGHUP
 Re-read the configuration file.
+.IP
+Not all configuration options can be modified during the lifetime of the
+server; of those that can't, some will just be ignored if they change while
+others will cause the new configuration to be rejected.
+See \fBdisorder_config\fR(5) for details.
 .TP
 .B SIGTERM
 Terminate the daemon gracefully.
@@ -130,9 +138,6 @@ See \fBdisorder_config\fR(5).
 .TP
 .I pkgconfdir/config.private
 Private configuration (now largely obsolete).
-.TP
-.I ~/.disorder/passwd
-Per-user password file.
 .SS "Communication"
 .TP
 .I pkgstatedir/socket
@@ -188,6 +193,14 @@ Lockfile.
 This prevents multiple instances of DisOrder running simultaneously.
 .SH ENVIRONMENT
 .TP
+.B DISORDER_CONFIG
+Configuration file to use instead of
+.IR pkgconfdir/config .
+.TP
+.B DISORDER_PRIVCONFIG
+Private configuration file to use instead of
+.IR pkgconfdir/config.private .
+.TP
 .B LC_ALL\fR, \fBLANG\fR, etc
 Current locale.
 See \fBlocale\fR(7).