Merge commit 'mlcastle/master'

[monkeysphere.git] / etc / monkeysphere-server.conf

diff --git a/etc/monkeysphere-server.conf b/etc/monkeysphere-server.conf
index 3c16c5fe112690a3ec1f9d467d92ad300bf3a9c0..847e8795ea4c53f0825a4f64262c761c5f364218 100644 (file)
--- a/etc/monkeysphere-server.conf
+++ b/etc/monkeysphere-server.conf
@@ -1,20 +1,31 @@
 # MonkeySphere server configuration file.
 
+# 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 for server
 #GNUPGHOME=/etc/monkeysphere/gnupg
 
 # GPG keyserver to search for keys
 #KEYSERVER=subkeys.pgp.net
 
-# Required key capabilities
+# Required user key capabilities
 # Must be quoted, lowercase, space-seperated list of the following:
 #   e = encrypt
 #   s = sign
 #   c = certify
 #   a = authentication
-#REQUIRED_KEY_CAPABILITY="e a"
+#REQUIRED_USER_KEY_CAPABILITY="a"
+
+# Path to authorized_user_ids file to process to create
+# authorized_keys file.  '%h' will be replaced by the home directory
+# of the user, and %u will be replaced by the username of the user.
+# For purely admin-controlled authorized_user_ids, you might put them
+# in /etc/monkeysphere/authorized_user_ids/%u
+#AUTHORIZED_USER_IDS="%h/.config/monkeysphere/authorized_user_ids"
 
 # Whether to add user controlled authorized_keys file to
 # monkeysphere-generated authorized_keys file.  Should be path to file
-# where '%h' will be substituted for the user's home directory.
-#USER_CONTROLLED_AUTHORIZED_KEYS=%h/.ssh/authorized_keys
+# where '%h' will be replaced by the home directory of the user.
+# To not add any user-controlled file, put "-"
+#USER_CONTROLLED_AUTHORIZED_KEYS="%h/.ssh/authorized_keys"