X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=etc%2Fmonkeysphere.conf;h=d9bbad34a7fff598db0b44ce7500eb6366ad3d97;hb=5a83949a37cb3f57b67a1d8d2308290f9fd55b93;hp=aa3a6640bd129eb893fc0aa8c17a8aa77741e430;hpb=7d02db7106da26f7705563297544a4ba1edfc71b;p=monkeysphere.git

diff --git a/etc/monkeysphere.conf b/etc/monkeysphere.conf
index aa3a664..d9bbad3 100644
--- a/etc/monkeysphere.conf
+++ b/etc/monkeysphere.conf
@@ -2,11 +2,21 @@
 
 # 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 home directory
-#GNUPGHOME=~/.gnupg
+# Log level.  Can be SILENT, ERROR, INFO, DEBUG, in increasing order
+# of verbosity.
+#LOG_LEVEL=INFO
 
-# GPG keyserver to search for keys
+# GPG home directory.  If not specified either here or in the
+# MONKEYSPHERE_GNUPGHOME environment variable, then the value of the
+# GNUPGHOME environment variable will be used.  If GNUPGHOME is not
+# set either, then the default value is listed below.
+# GNUPGHOME=~/.gnupg
+
+# GPG keyserver to search for keys.
 #KEYSERVER=subkeys.pgp.net
 
 # Set whether or not to check keyservers at every monkeysphere
@@ -17,12 +27,12 @@
 # of the keyserver.
 #CHECK_KEYSERVER=true
 
-# ssh known_hosts file
+# The path to the SSH known_hosts file.
 #KNOWN_HOSTS=~/.ssh/known_hosts
 
 # Whether or not to hash the generated known_hosts lines.
-# Should be "true" or "false"
+# Should be "true" or "false".
 #HASH_KNOWN_HOSTS=true
 
-# ssh authorized_keys file (FIXME: why is this relevant in this file?)
+# The path to the SSH authorized_keys file.
 #AUTHORIZED_KEYS=~/.ssh/authorized_keys