summaryrefslogtreecommitdiff
path: root/etc/monkeysphere-server.conf
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@phys.columbia.edu>2008-07-09 19:41:03 -0400
committerJameson Graef Rollins <jrollins@phys.columbia.edu>2008-07-09 20:27:45 -0400
commitc8b42c1d77005ab3f41d20cc2524f4307086ec4f (patch)
treeda2a6afaa400993037bf4f5a5550f98803addbd0 /etc/monkeysphere-server.conf
parente6d14b3efaa96cc55eae34556daf8f85f09b92f6 (diff)
A bunch of changes for variable scoping, exit codes, etc. See
debian/changelog.
Diffstat (limited to 'etc/monkeysphere-server.conf')
-rw-r--r--etc/monkeysphere-server.conf8
1 files changed, 7 insertions, 1 deletions
diff --git a/etc/monkeysphere-server.conf b/etc/monkeysphere-server.conf
index defb0f7..15f43b1 100644
--- a/etc/monkeysphere-server.conf
+++ b/etc/monkeysphere-server.conf
@@ -2,8 +2,11 @@
# This is an sh-style shell configuration file. Variable names should
# be separated from their assignements by a single '=' and no spaces.
+# Environement variables with the same names as these variables but
+# prefeced by "MONKEYSPHERE_" will take precedence over the values
+# specified here.
-# GPG keyserver to search for keys
+# GPG keyserver to search for keys.
#KEYSERVER=subkeys.pgp.net
# Path to authorized_user_ids file to process to create
@@ -20,3 +23,6 @@
# FIXME: this usage of "-" contravenes the normal convention where "-"
# means standard in/out. Why not use "none" or "" instead?
#RAW_AUTHORIZED_KEYS="%h/.ssh/authorized_keys"
+
+# User who controls the monkeysphere authentication keyring.
+#MONKEYSPHERE_USER=monkeysphere