summaryrefslogtreecommitdiff
path: root/etc/monkeysphere-server.conf
diff options
context:
space:
mode:
Diffstat (limited to 'etc/monkeysphere-server.conf')
-rw-r--r--etc/monkeysphere-server.conf16
1 files changed, 14 insertions, 2 deletions
diff --git a/etc/monkeysphere-server.conf b/etc/monkeysphere-server.conf
index 847e879..85b37c1 100644
--- a/etc/monkeysphere-server.conf
+++ b/etc/monkeysphere-server.conf
@@ -3,6 +3,9 @@
# This is an sh-style shell configuration file. Variable names should
# be separated from their assignements by a single '=' and no spaces.
+#FIXME: shouldn't this be in /var by default? These are not text
+#files, and they should generally not be managed directly by the
+#admin:
# GPG home directory for server
#GNUPGHOME=/etc/monkeysphere/gnupg
@@ -24,8 +27,17 @@
# in /etc/monkeysphere/authorized_user_ids/%u
#AUTHORIZED_USER_IDS="%h/.config/monkeysphere/authorized_user_ids"
+#FIXME: why is the following variable named USER_CONTROLLED_...?
+#shouldn't this be something like MONKEYSPHERE_RAW_AUTHORIZED_KEYS
+#instead? For example, what about a server where the administrator
+#has locked down the authorized_keys file from user control, but still
+#wants to combine raw authorized_keys for some users with the
+#monkeysphere?
+
# 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 "-"
+# where '%h' will be replaced by the home directory of the user or
+# '%u' by the username. To not add any user-controlled file, put "-"
+#FIXME: this usage of "-" contravenes the normal convention where "-"
+#means standard in/out. Why not use "none" or "" instead?
#USER_CONTROLLED_AUTHORIZED_KEYS="%h/.ssh/authorized_keys"