projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://labs.riseup.net/~micah/public_git/monkeysphere
[monkeysphere.git]
/
etc
/
monkeysphere.conf
diff --git
a/etc/monkeysphere.conf
b/etc/monkeysphere.conf
index 2648fa963d2d28f4da0e5d792c5e9b2cc057a814..2f0b877a1ba772471b9d8650b2dbcb3b31140c7f 100644
(file)
--- a/
etc/monkeysphere.conf
+++ b/
etc/monkeysphere.conf
@@
-1,11
+1,15
@@
-# Monkey
S
phere system-wide client configuration file.
+# Monkey
s
phere system-wide client configuration file.
# This is an sh-style shell configuration file. Variable names should
# This is an sh-style shell configuration file. Variable names should
-# be separated from their assign
e
ments by a single '=' and no spaces.
-# Environ
e
ment variables with the same names as these variables but
-# pref
e
ced by "MONKEYSPHERE_" will take precedence over the values
+# be separated from their assignments by a single '=' and no spaces.
+# Environment variables with the same names as these variables but
+# pref
a
ced by "MONKEYSPHERE_" will take precedence over the values
# specified here.
# specified here.
+# Log level. Can be SILENT, ERROR, INFO, VERBOSE, DEBUG, in
+# increasing order of verbosity.
+#LOG_LEVEL=INFO
+
# 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
# 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
@@
-13,7
+17,7
@@
# GNUPGHOME=~/.gnupg
# GPG keyserver to search for keys.
# GNUPGHOME=~/.gnupg
# GPG keyserver to search for keys.
-#KEYSERVER=
subkeys.pgp
.net
+#KEYSERVER=
pool.sks-keyservers
.net
# Set whether or not to check keyservers at every monkeysphere
# interaction, including all ssh connections if you use the
# Set whether or not to check keyservers at every monkeysphere
# interaction, including all ssh connections if you use the