break out proxy command validation code into it's own function (no functional change)

[monkeysphere.git] / etc / monkeysphere.conf

diff --git a/etc/monkeysphere.conf b/etc/monkeysphere.conf
index 2648fa963d2d28f4da0e5d792c5e9b2cc057a814..ca2fb834460dbe0b79d42069233a42211276a6ad 100644 (file)
--- a/etc/monkeysphere.conf
+++ b/etc/monkeysphere.conf
@@ -1,26 +1,31 @@
-# MonkeySphere system-wide client configuration file.
+# Monkeysphere system-wide client configuration file.
 
 # 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
+# be separated from their assignments by a single '=' and no spaces.
+# Environment variables with the same names as these variables but
+# prefaced by "MONKEYSPHERE_" will take precedence over the values
 # specified here.
 
+# Log level.  Can be SILENT, ERROR, INFO, VERBOSE, DEBUG, in
+# increasing order of verbosity.
+#LOG_LEVEL=INFO
+
 # 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
+#GNUPGHOME=~/.gnupg
 
 # GPG keyserver to search for keys.
-#KEYSERVER=subkeys.pgp.net
+#KEYSERVER=pool.sks-keyservers.net
 
 # Set whether or not to check keyservers at every monkeysphere
 # interaction, including all ssh connections if you use the
-# monkeysphere-ssh-proxycommand.
-# NOTE: setting CHECK_KEYSERVER to true will leak information about
-# the timing and frequency of your ssh connections to the maintainer
-# of the keyserver.
+# monkeysphere ssh-proxycommand.  Leave unset for default behavior
+# (see KEYSERVER CHECKING in monkeysphere(1)), or set to true or false.
+# NOTE: setting CHECK_KEYSERVER explicitly to true will leak
+# information about the timing and frequency of your ssh connections
+# to the maintainer of the keyserver.
 #CHECK_KEYSERVER=true
 
 # The path to the SSH known_hosts file.
@@ -28,7 +33,7 @@
 
 # Whether or not to hash the generated known_hosts lines.
 # Should be "true" or "false".
-#HASH_KNOWN_HOSTS=true
+#HASH_KNOWN_HOSTS=false
 
 # The path to the SSH authorized_keys file.
 #AUTHORIZED_KEYS=~/.ssh/authorized_keys