add george system changelog

[monkeysphere.git] / monkeysphere.conf

diff --git a/monkeysphere.conf b/monkeysphere.conf
index 1a6cff19597873aa4753bfe8eb31368618ac1504..cd5e3b20649edd2ed42784bcbe81d3243d8d0195 100644 (file)
--- a/monkeysphere.conf
+++ b/monkeysphere.conf
@@ -1,26 +1,15 @@
-# monkeysphere configuration file
-# this is currently meant to be sourced by bash.
+# monkeysphere system configuration file
 
-# configuration directory
-CONF_DIR=/etc/monkeysphere
+# 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.
 
-# where the per-user authorized user id files are stored
-AUTH_USER_IDS_DIR="$CONF_DIR"/auth_user_ids
+AUTH_USER_FILE=/etc/monkeysphere/auth_user_ids/"$USER"
 
-# where the per-user authorized_keys info is stored
-#AUTH_KEYS_DIR=/var/lib/monkeysphere/authorized_keys
-AUTH_KEYS_DIR="$CONF_DIR"/authorized_keys
+STAGING_AREA=/var/lib/monkeysphere/stage/"$USER"
 
 # gpg home directory for server
-GNUPGHOME="$CONF_DIR"/gnupg
+GNUPGHOME=/etc/monkeysphere/gnupg
 
 # gpg keyserver to search for keys
 KEYSERVER=subkeys.pgp.net
-
-# acceptable key capabilities for user keys
-# can be any combination of:
-#   e = encrypt
-#   s = sign
-#   c = certify
-#   a = authentication
-REQUIRED_KEY_CAPABILITY='sca'