X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=etc%2Fmonkeysphere-server.conf;h=8b9ffa4568b97acd778ef4ec37904167f3747c11;hb=ff9ffb70eed7d4c2c33f4a5ba1f5a5f02547b2ab;hp=847e8795ea4c53f0825a4f64262c761c5f364218;hpb=3a6f611a52d56b919b8c50a6e1700af43ff49578;p=monkeysphere.git

diff --git a/etc/monkeysphere-server.conf b/etc/monkeysphere-server.conf
index 847e879..8b9ffa4 100644
--- a/etc/monkeysphere-server.conf
+++ b/etc/monkeysphere-server.conf
@@ -1,31 +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
-
-# 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"
+# Log level.  Can be SILENT, ERROR, INFO, VERBOSE, DEBUG, in
+# increasing order of verbosity.
+#LOG_LEVEL=INFO
 
 # 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.
+# 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"
+# 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.
-# To not add any user-controlled file, put "-"
-#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"