Update to new agreed default host key usage flag (only "a" required

[monkeysphere.git] / etc / monkeysphere.conf

diff --git a/etc/monkeysphere.conf b/etc/monkeysphere.conf
index 385165a28a83e99e1d224999a747e9cc7029a76e..f2ba4a78c12c6b0e8377ac4d27da1d9e51d3ab4b 100644 (file)
--- a/etc/monkeysphere.conf
+++ b/etc/monkeysphere.conf
@@ -1,7 +1,7 @@
 # MonkeySphere system-wide client configuration file.
 
-# authorized_user_ids file
-#AUTHORIZED_USER_IDS=~/.config/monkeysphere/authorized_user_ids
+# This is an sh-style shell configuration file.  Variable names should
+# be separated from their assignements by a single '=' and no spaces.
 
 # GPG home directory
 #GNUPGHOME=~/.gnupg
@@ -15,17 +15,19 @@
 #   s = sign
 #   c = certify
 #   a = authentication
-#REQUIRED_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. If empty, then no
-# user-controlled file will be added.
-#USER_CONTROLLED_AUTHORIZED_KEYS=~/.ssh/authorized_keys
+# ssh known_hosts file
+#KNOWN_HOSTS=~/.ssh/known_hosts
 
-# User known_hosts file
-#USER_KNOWN_HOSTS=~/.ssh/known_hosts
+# Whether or not to hash the generated known_hosts lines.
+# Should be "true" or "false"
+#HASH_KNOWN_HOSTS=true
 
-# Whether or not to hash the generated known_hosts lines
-# (empty mean "no").
-#HASH_KNOWN_HOSTS=
+# ssh authorized_keys file
+#AUTHORIZED_KEYS=~/.ssh/known_hosts
 
+# This overrides other environment variables
+# NOTE: there is leakage
+#CHECK_KEYRING=true