Merge commit 'dkg/master'

[monkeysphere.git] / etc / monkeysphere.conf

diff --git a/etc/monkeysphere.conf b/etc/monkeysphere.conf
index 003ecf689591c2b61440158564afac854a900e88..cce936665830de5992f40e37f5d47bbf84406481 100644 (file)
--- a/etc/monkeysphere.conf
+++ b/etc/monkeysphere.conf
@@ -3,32 +3,36 @@
 # 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
 #GNUPGHOME=~/.gnupg
 
 # GPG keyserver to search for keys
 #KEYSERVER=subkeys.pgp.net
 
+# FIXME: consider removing REQUIRED_*_KEY_CAPABILITY entirely from
+# this example config, given our discussion
 # 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_HOST_KEY_CAPABILITY="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
-
-# User known_hosts file
-#USER_KNOWN_HOSTS=~/.ssh/known_hosts
+# ssh known_hosts file
+#KNOWN_HOSTS=~/.ssh/known_hosts
 
 # Whether or not to hash the generated known_hosts lines.
 # Should be "true" or "false"
 #HASH_KNOWN_HOSTS=true
+
+# ssh authorized_keys file (FIXME: why is this relevant in this file?)
+#AUTHORIZED_KEYS=~/.ssh/known_hosts
+
+# check keyservers at every ssh connection:
+# This overrides other environment variables (FIXME: what does this mean???)
+# 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