A bunch of changes for variable scoping, exit codes, etc. See

[monkeysphere.git] / etc / monkeysphere-server.conf

diff --git a/etc/monkeysphere-server.conf b/etc/monkeysphere-server.conf
index defb0f7e9b07c6248fe736fa121cfc10d08403d0..15f43b1aeb2f5f0ea0f0d3115f76ae558d1308bb 100644 (file)
--- a/etc/monkeysphere-server.conf
+++ b/etc/monkeysphere-server.conf
@@ -2,8 +2,11 @@
 
 # This is an sh-style shell configuration file.  Variable names should
 # be separated from their assignements by a single '=' and no spaces.
+# Environement variables with the same names as these variables but
+# prefeced by "MONKEYSPHERE_" will take precedence over the values
+# specified here.
 
-# GPG keyserver to search for keys
+# GPG keyserver to search for keys.
 #KEYSERVER=subkeys.pgp.net
 
 # Path to authorized_user_ids file to process to create
@@ -20,3 +23,6 @@
 # FIXME: this usage of "-" contravenes the normal convention where "-"
 # means standard in/out.  Why not use "none" or "" instead?
 #RAW_AUTHORIZED_KEYS="%h/.ssh/authorized_keys"
+
+# User who controls the monkeysphere authentication keyring.
+#MONKEYSPHERE_USER=monkeysphere