Merge commit 'jrollins/master'

[monkeysphere.git] / monkeysphere.conf

diff --git a/monkeysphere.conf b/monkeysphere.conf
index 1e3abf92d2ff6c3373a50b45147f786d9cc71cce..a54b6bdb016da8d38be6aeef083800e26d3e36c3 100644 (file)
--- a/monkeysphere.conf
+++ b/monkeysphere.conf
@@ -1,7 +1,23 @@
-# monkeysphere configuration file
-# this is currently meant to be sourced by bash.
-CONF_DIR=/etc/monkeysphere
-AUTH_USER_IDS_DIR="$CONF_DIR"/auth_user_ids
-KEYRING="$CONF_DIR"/keyring.gpg
+# monkeysphere system configuration file
+
+# This is particular configuration is meant to be sourced by the
+# rhesus shell script when run in administrative mode to maintain
+# authorized_keys files for users.
+
+AUTH_USER_FILE=/etc/monkeysphere/auth_user_ids/"$USER"
+
+STAGING_AREA=/var/lib/monkeysphere/stage/"$USER"
+
+# gpg home directory for server
+GNUPGHOME=/etc/monkeysphere/gnupg
+
+# gpg keyserver to search for keys
 KEYSERVER=subkeys.pgp.net
-GNUPGHOME="$CONF_DIR"/gnupg
+
+# acceptable key capabilities for user keys
+# can be any combination of:
+#   e = encrypt
+#   s = sign
+#   c = certify
+#   a = authentication
+REQUIRED_KEY_CAPABILITY='sca'