summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@phys.columbia.edu>2008-09-02 00:38:27 -0700
committerJameson Graef Rollins <jrollins@phys.columbia.edu>2008-09-02 00:38:27 -0700
commitbb2427c28bf40179c4881b22c23f23f9bea78f55 (patch)
tree0bc8478cc689eee669edcae7272e621ac4a33f83 /man
parent948b21702fbeaf1874286bd9b0d7c27c37d55c2a (diff)
Finalize new log level changes. This is more or less doing what it should. The only problem, I think, is that it doesn't handle improperly specified LOG_LEVEL well, effectively resorting to silent.
Diffstat (limited to 'man')
-rw-r--r--man/man1/monkeysphere-ssh-proxycommand.15
-rw-r--r--man/man1/monkeysphere.14
-rw-r--r--man/man8/monkeysphere-server.84
3 files changed, 13 insertions, 0 deletions
diff --git a/man/man1/monkeysphere-ssh-proxycommand.1 b/man/man1/monkeysphere-ssh-proxycommand.1
index 9aad232..c3c7993 100644
--- a/man/man1/monkeysphere-ssh-proxycommand.1
+++ b/man/man1/monkeysphere-ssh-proxycommand.1
@@ -55,6 +55,11 @@ All environment variables defined in monkeysphere(1) can also be used
for the proxy command, with one note:
.TP
+MONKEYSPHERE_LOG_LEVEL
+Set the log level. Can be SILENT, ERROR, INFO, DEBUG, in increasing
+order of verbosity.
+
+.TP
MONKEYSPHERE_CHECK_KEYSERVER
Setting this variable (to `true' or `false') will override the policy
defined in KEYSERVER CHECKING above.
diff --git a/man/man1/monkeysphere.1 b/man/man1/monkeysphere.1
index 92ba2fa..26327f4 100644
--- a/man/man1/monkeysphere.1
+++ b/man/man1/monkeysphere.1
@@ -83,6 +83,10 @@ Output a brief usage summary. `h' or `?' may be used in place of
The following environment variables will override those specified in
the monkeysphere.conf configuration file (defaults in parentheses):
.TP
+MONKEYSPHERE_LOG_LEVEL
+Set the log level. Can be SILENT, ERROR, INFO, DEBUG, in increasing
+order of verbosity.
+.TP
MONKEYSPHERE_GNUPGHOME, GNUPGHOME
GnuPG home directory (~/.gnupg).
.TP
diff --git a/man/man8/monkeysphere-server.8 b/man/man8/monkeysphere-server.8
index 5985f24..b63f659 100644
--- a/man/man8/monkeysphere-server.8
+++ b/man/man8/monkeysphere-server.8
@@ -182,6 +182,10 @@ The following environment variables will override those specified in
the monkeysphere-server.conf configuration file (defaults in
parentheses):
.TP
+MONKEYSPHERE_LOG_LEVEL
+Set the log level. Can be SILENT, ERROR, INFO, DEBUG, in increasing
+order of verbosity.
+.TP
MONKEYSPHERE_KEYSERVER
OpenPGP keyserver to use (subkeys.pgp.net).
.TP