X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=etc%2Fmonkeysphere.conf;h=2648fa963d2d28f4da0e5d792c5e9b2cc057a814;hb=4fc090419c3c87a6689ee2f42b94e1f40aa06e5c;hp=003ecf689591c2b61440158564afac854a900e88;hpb=92c70306aa5f96c8dfa69f2c90dca58908e719f7;p=monkeysphere.git

diff --git a/etc/monkeysphere.conf b/etc/monkeysphere.conf
index 003ecf6..2648fa9 100644
--- a/etc/monkeysphere.conf
+++ b/etc/monkeysphere.conf
@@ -2,33 +2,33 @@
 
 # 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.
 
-# authorized_user_ids file
-#AUTHORIZED_USER_IDS=~/.config/monkeysphere/authorized_user_ids
+# 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 home directory
-#GNUPGHOME=~/.gnupg
-
-# GPG keyserver to search for keys
+# 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"
-
-# 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.
+# NOTE: setting CHECK_KEYSERVER 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