X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=etc%2Fmonkeysphere-server.conf;h=8b9ffa4568b97acd778ef4ec37904167f3747c11;hb=80453e14e8c10071d9025c49b49e9feb3ed0f26c;hp=82da49783f91fc3faff6c1fd240af84596efa2b1;hpb=07cb14cdb80ef060e63ba2713ef70b67db9f5783;p=monkeysphere.git

diff --git a/etc/monkeysphere-server.conf b/etc/monkeysphere-server.conf
index 82da497..8b9ffa4 100644
--- a/etc/monkeysphere-server.conf
+++ b/etc/monkeysphere-server.conf
@@ -1,23 +1,28 @@
-# MonkeySphere server configuration file.
+# 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.
+# be separated from their assignments by a single '=' and no spaces.
+# Environment variables with the same names as these variables but
+# prefaced by "MONKEYSPHERE_" will take precedence over the values
+# specified here.
 
-# GPG home directory for server
-#GNUPGHOME=/etc/monkeysphere/gnupg
+# User who controls the monkeysphere authentication keyring.
+#MONKEYSPHERE_USER=monkeysphere
 
-# GPG keyserver to search for keys
-#KEYSERVER=subkeys.pgp.net
+# Log level.  Can be SILENT, ERROR, INFO, VERBOSE, DEBUG, in
+# increasing order of verbosity.
+#LOG_LEVEL=INFO
 
-# Required user key capabilities
-# Must be quoted, lowercase, space-seperated list of the following:
-#   e = encrypt
-#   s = sign
-#   c = certify
-#   a = authentication
-#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, for instance.
+#AUTHORIZED_USER_IDS="%h/.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 replaced by the home directory of the user.
-#USER_CONTROLLED_AUTHORIZED_KEYS=%h/.ssh/authorized_keys
+# Path to a user controlled authorized_keys file to be added to the
+# monkeysphere-generated authorized_keys file.  '%h' will be replaced
+# by the home directory of the user, and '%u' will by replaced by the
+# username of the user.  Setting this variable to 'none' prevents the
+# inclusion of user controlled authorized_keys file.
+# RAW_AUTHORIZED_KEYS="%h/.ssh/authorized_keys"