simplify server config files, and add keyserver config variables.

diff --git a/etc/authentication/gpg.conf b/etc/authentication/gpg.conf
deleted file mode 100644 (file)
index 77b96e1..0000000
--- a/etc/authentication/gpg.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-# Monkeysphere authentication GNUPG home gpg.conf
-
-# Location of the various Monkeysphere keyrings.
-# It is highly recommended that you
-#    DO NOT MODIFY
-# these variables.
-primary-keyring /var/lib/monkeysphere/authentication/sphere/pubring.gpg
-keyring /var/lib/monkeysphere/authentication/core/pubring.gpg
-
-# PGP keyserver to use for PGP queries.
-keyserver hkp://pool.sks-keyservers.net
-
-# GPG list options.  It is recommended that you have at least
-# "show-uid-validity".
-list-options show-uid-validity

diff --git a/etc/host/gpg.conf b/etc/host/gpg.conf
deleted file mode 100644 (file)
index 66c668b..0000000
--- a/etc/host/gpg.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Monkeysphere host GNUPG home gpg.conf
-
-# GPG list options.  It is recommended that you have at least
-# "show-uid-validity".
-list-options show-uid-validity

diff --git a/etc/authentication/config b/etc/monkeysphere-authentication.conf
similarity index 95%
rename from etc/authentication/config
rename to etc/monkeysphere-authentication.conf
index c9b57d294c0fc004e5ce7f2ed8898da6af52eee0..ea40966168046f82a277733932b0ceac84ca77ff 100644 (file)
--- a/etc/authentication/config
+++ b/etc/monkeysphere-authentication.conf
@@ -10,6 +10,9 @@
 # increasing order of verbosity.
 #LOG_LEVEL=INFO
 
+# OpenPGP keyserver
+#KEYSERVER=pool.sks-keyservers.net
+
 # User who controls the monkeysphere 'sphere' keyring.
 #MONKEYSPHERE_USER=monkeysphere
 

diff --git a/etc/host/config b/etc/monkeysphere-host.conf
similarity index 88%
rename from etc/host/config
rename to etc/monkeysphere-host.conf
index 293cbe08063adbc48fcea315e06ff425e93795f7..80a4b65a35ff04f2ec3452c92bb9570142befe8a 100644 (file)
--- a/etc/host/config
+++ b/etc/monkeysphere-host.conf
@@ -9,3 +9,6 @@
 # Log level.  Can be SILENT, ERROR, INFO, VERBOSE, DEBUG, in
 # increasing order of verbosity.
 #LOG_LEVEL=INFO
+
+# OpenPGP keyserver
+#KEYSERVER=pool.sks-keyservers.net