summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2008-10-25 00:16:34 -0400
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2008-10-25 00:16:34 -0400
commit14fd73037386e107dd99bc5a42102e229619e53b (patch)
treea7062034c08f213bd76a3d503333e0eaa4aec3fb
parent07a4017dae6ae462b4710db8a28a3a2e84cd1eda (diff)
switch default keyservers to be pool.sks-keyservers.net, since that pool seems to be well-monitored and updated.
-rw-r--r--etc/monkeysphere.conf2
-rwxr-xr-xsrc/monkeysphere-server2
2 files changed, 2 insertions, 2 deletions
diff --git a/etc/monkeysphere.conf b/etc/monkeysphere.conf
index d9bbad3..a45fff0 100644
--- a/etc/monkeysphere.conf
+++ b/etc/monkeysphere.conf
@@ -17,7 +17,7 @@
# GNUPGHOME=~/.gnupg
# GPG keyserver to search for keys.
-#KEYSERVER=subkeys.pgp.net
+#KEYSERVER=pool.sks-keyservers.net
# Set whether or not to check keyservers at every monkeysphere
# interaction, including all ssh connections if you use the
diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index 6d57fc4..d3ba5e4 100755
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -922,7 +922,7 @@ unset MONKEYSPHERE_USER
# set empty config variable with ones from the environment, or with
# defaults
LOG_LEVEL=${MONKEYSPHERE_LOG_LEVEL:=${LOG_LEVEL:="INFO"}}
-KEYSERVER=${MONKEYSPHERE_KEYSERVER:=${KEYSERVER:="subkeys.pgp.net"}}
+KEYSERVER=${MONKEYSPHERE_KEYSERVER:=${KEYSERVER:="pool.sks-keyservers.net"}}
AUTHORIZED_USER_IDS=${MONKEYSPHERE_AUTHORIZED_USER_IDS:=${AUTHORIZED_USER_IDS:="%h/.monkeysphere/authorized_user_ids"}}
RAW_AUTHORIZED_KEYS=${MONKEYSPHERE_RAW_AUTHORIZED_KEYS:=${RAW_AUTHORIZED_KEYS:="%h/.ssh/authorized_keys"}}
MONKEYSPHERE_USER=${MONKEYSPHERE_MONKEYSPHERE_USER:=${MONKEYSPHERE_USER:="monkeysphere"}}