X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=etc%2Fmonkeysphere-server.conf;h=1b0ed9f96919313b7c8fbd48f172926d65028bb6;hb=bb2427c28bf40179c4881b22c23f23f9bea78f55;hp=defb0f7e9b07c6248fe736fa121cfc10d08403d0;hpb=95ab38905ecc678d8256363e228bca20eb0334a0;p=monkeysphere.git

diff --git a/etc/monkeysphere-server.conf b/etc/monkeysphere-server.conf
index defb0f7..1b0ed9f 100644
--- a/etc/monkeysphere-server.conf
+++ b/etc/monkeysphere-server.conf
@@ -2,8 +2,15 @@
 
 # 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
+# Log level.  Can be SILENT, ERROR, INFO, DEBUG, in increasing order
+# of verbosity.
+#LOG_LEVEL=INFO
+
+# GPG keyserver to search for keys.
 #KEYSERVER=subkeys.pgp.net
 
 # Path to authorized_user_ids file to process to create
@@ -20,3 +27,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