summaryrefslogtreecommitdiff
path: root/etc/monkeysphere.conf
diff options
context:
space:
mode:
authorMatt Goins <mjgoins@openflows.com>2008-06-25 01:59:19 -0400
committerMatt Goins <mjgoins@openflows.com>2008-06-25 01:59:19 -0400
commit43097e923b8051ecd0912e367c1cd78149a97dbe (patch)
treee0553c718ea443a9f7f08a50c6ef1f7c9a9d953a /etc/monkeysphere.conf
parentc1a5568ee2f6c46501df057a71f23681ea0194ec (diff)
parente0b50e3859931c7fe2a58bb08af440a4f2455174 (diff)
Merge branch 'master' of http://lair.fifthhorseman.net/~dkg/git/monkeysphere
Diffstat (limited to 'etc/monkeysphere.conf')
-rw-r--r--etc/monkeysphere.conf23
1 files changed, 9 insertions, 14 deletions
diff --git a/etc/monkeysphere.conf b/etc/monkeysphere.conf
index f2ba4a7..aa3a664 100644
--- a/etc/monkeysphere.conf
+++ b/etc/monkeysphere.conf
@@ -9,14 +9,13 @@
# 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="a"
-#REQUIRED_USER_KEY_CAPABILITY="a"
+# 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
# ssh known_hosts file
#KNOWN_HOSTS=~/.ssh/known_hosts
@@ -25,9 +24,5 @@
# Should be "true" or "false"
#HASH_KNOWN_HOSTS=true
-# ssh authorized_keys file
-#AUTHORIZED_KEYS=~/.ssh/known_hosts
-
-# This overrides other environment variables
-# NOTE: there is leakage
-#CHECK_KEYRING=true
+# ssh authorized_keys file (FIXME: why is this relevant in this file?)
+#AUTHORIZED_KEYS=~/.ssh/authorized_keys