From 924d4c617c5f5edcabb630521f0c97436f6f1cb7 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Mon, 15 Sep 2008 11:36:27 -0700 Subject: Start changes to move gpg.conf files into /etc/monkeysphere. --- man/man8/monkeysphere-server.8 | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'man') diff --git a/man/man8/monkeysphere-server.8 b/man/man8/monkeysphere-server.8 index c905f2f..d25f0e8 100644 --- a/man/man8/monkeysphere-server.8 +++ b/man/man8/monkeysphere-server.8 @@ -185,6 +185,9 @@ The following environment variables will override those specified in the monkeysphere-server.conf configuration file (defaults in parentheses): .TP +MONKEYSPHERE_MONKEYSPHERE_USER +User to control authentication keychain (monkeysphere). +.TP MONKEYSPHERE_LOG_LEVEL Set the log level (INFO). Can be SILENT, ERROR, INFO, VERBOSE, DEBUG, in increasing order of verbosity. @@ -199,9 +202,6 @@ Path to user authorized_user_ids file MONKEYSPHERE_RAW_AUTHORIZED_KEYS Path to user-controlled authorized_keys file. `-' means not to add user-controlled file (%h/.ssh/authorized_keys). -.TP -MONKEYSPHERE_MONKEYSPHERE_USER -User to control authentication keychain (monkeysphere). .SH FILES @@ -212,6 +212,12 @@ System monkeysphere-server config file. /etc/monkeysphere/monkeysphere.conf System-wide monkeysphere config file. .TP +/etc/monkeysphere/gnupg-host.conf +Monkeysphere host GNUPG home gpg.conf +.TP +/etc/monkeysphere/gnupg-authentication.conf +Monkeysphere authentication GNUPG home gpg.conf +.TP /var/lib/monkeysphere/authorized_keys/USER Monkeysphere-generated user authorized_keys files. .TP -- cgit v1.2.3