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

3 files changed, 14 insertions, 6 deletions

diff --git a/etc/gnupg-authentication.conf b/etc/gnupg-authentication.conf
new file mode 100644
index 0000000..760c5e3
--- /dev/null
+++ b/etc/gnupg-authentication.conf
@@ -0,0 +1,8 @@
+# Monkeysphere authentication GNUPG home gpg.conf
+
+primary-keyring /var/lib/monkeysphere/gnupg-authentication/pubring.gpg
+keyring /var/lib/monkeysphere/gnupg-host/pubring.gpg
+
+keyserver hkp://pgp.mit.edu
+
+list-options show-uid-validity
diff --git a/etc/gnupg-host.conf b/etc/gnupg-host.conf
new file mode 100644
index 0000000..c450910
--- /dev/null
+++ b/etc/gnupg-host.conf
@@ -0,0 +1,3 @@
+# Monkeysphere host GNUPG home gpg.conf
+
+list-options show-uid-validity
diff --git a/etc/monkeysphere-server.conf b/etc/monkeysphere-server.conf
index c001f2d..adbac7e 100644
--- 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