summaryrefslogtreecommitdiff
path: root/etc/monkeysphere.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.conf
parente6d14b3efaa96cc55eae34556daf8f85f09b92f6 (diff)
A bunch of changes for variable scoping, exit codes, etc. See
debian/changelog.
Diffstat (limited to 'etc/monkeysphere.conf')
-rw-r--r--etc/monkeysphere.conf18
1 files changed, 12 insertions, 6 deletions
diff --git a/etc/monkeysphere.conf b/etc/monkeysphere.conf
index aa3a664..2648fa9 100644
--- a/etc/monkeysphere.conf
+++ b/etc/monkeysphere.conf
@@ -2,11 +2,17 @@
# 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 home directory
-#GNUPGHOME=~/.gnupg
+# GPG home directory. If not specified either here or in the
+# MONKEYSPHERE_GNUPGHOME environment variable, then the value of the
+# GNUPGHOME environment variable will be used. If GNUPGHOME is not
+# set either, then the default value is listed below.
+# GNUPGHOME=~/.gnupg
-# GPG keyserver to search for keys
+# GPG keyserver to search for keys.
#KEYSERVER=subkeys.pgp.net
# Set whether or not to check keyservers at every monkeysphere
@@ -17,12 +23,12 @@
# of the keyserver.
#CHECK_KEYSERVER=true
-# ssh known_hosts file
+# The path to the SSH known_hosts file.
#KNOWN_HOSTS=~/.ssh/known_hosts
# Whether or not to hash the generated known_hosts lines.
-# Should be "true" or "false"
+# Should be "true" or "false".
#HASH_KNOWN_HOSTS=true
-# ssh authorized_keys file (FIXME: why is this relevant in this file?)
+# The path to the SSH authorized_keys file.
#AUTHORIZED_KEYS=~/.ssh/authorized_keys