X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=etc%2Fmonkeysphere.conf;h=ce6e82a5dd46df97fb05731b04bb03b8e0fed2d7;hb=e9f00652e3503ef2292e6d27df80cbb4c8e09504;hp=003ecf689591c2b61440158564afac854a900e88;hpb=e619b23879fde5703da435141754324dcf7cfa53;p=monkeysphere.git

diff --git a/etc/monkeysphere.conf b/etc/monkeysphere.conf
index 003ecf6..ce6e82a 100644
--- a/etc/monkeysphere.conf
+++ b/etc/monkeysphere.conf
@@ -1,34 +1,43 @@
-# 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.
-
-# authorized_user_ids file
-#AUTHORIZED_USER_IDS=~/.config/monkeysphere/authorized_user_ids
-
-# GPG home directory
+# 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
 
-# GPG keyserver to search for keys
-#KEYSERVER=subkeys.pgp.net
-
-# Required key capabilities
-# Must be quoted, lowercase, space-seperated list of the following:
-#   e = encrypt
-#   s = sign
-#   c = certify
-#   a = authentication
-#REQUIRED_HOST_KEY_CAPABILITY="e a"
-#REQUIRED_USER_KEY_CAPABILITY="a"
+# GPG keyserver to search for keys.
+#KEYSERVER=pool.sks-keyservers.net
 
-# Path to user-controlled authorized_keys file to add to
-# Monkeysphere-generated authorized_keys file.
-# To not add any user-controlled file, put "-"
-#USER_CONTROLLED_AUTHORIZED_KEYS=~/.ssh/authorized_keys
+# Set whether or not to check keyservers at every monkeysphere
+# interaction, including all ssh connections if you use the
+# 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
 
-# User known_hosts file
-#USER_KNOWN_HOSTS=~/.ssh/known_hosts
+# 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
+
+# The path to the SSH authorized_keys file.
+#AUTHORIZED_KEYS=~/.ssh/authorized_keys
+
+# Set to true to enable validation agent during X session startup
+# where available.
+#USE_VALIDATION_AGENT=false