Start changes to move gpg.conf files into /etc/monkeysphere.

[monkeysphere.git] / etc / monkeysphere-server.conf

diff --git a/etc/monkeysphere-server.conf b/etc/monkeysphere-server.conf
index c001f2d11ac01a4c8d3755018f170fb58b965615..adbac7ec474c2879b6aa41200f8b5e24ad3622c1 100644 (file)
--- a/etc/monkeysphere-server.conf
+++ b/etc/monkeysphere-server.conf
@@ -6,13 +6,13 @@
 # prefeced by "MONKEYSPHERE_" will take precedence over the values
 # specified here.
 
+# User who controls the monkeysphere authentication keyring.
+#MONKEYSPHERE_USER=monkeysphere
+
 # Log level.  Can be SILENT, ERROR, INFO, DEBUG, in increasing order
 # of verbosity.
 #LOG_LEVEL=INFO
 
-# GPG keyserver to search for keys.
-#KEYSERVER=subkeys.pgp.net
-
 # Path to authorized_user_ids file to process to create
 # authorized_keys file.  '%h' will be replaced by the home directory
 # of the user, and %u will be replaced by the username of the user.
@@ -27,6 +27,3 @@
 # 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