switch default keyservers to be pool.sks-keyservers.net, since that pool seems to...

diff --git a/etc/monkeysphere.conf b/etc/monkeysphere.conf
index d9bbad34a7fff598db0b44ce7500eb6366ad3d97..a45fff02bd17bdb266730f9ac981680583444916 100644 (file)
--- a/etc/monkeysphere.conf
+++ b/etc/monkeysphere.conf
@@ -17,7 +17,7 @@
 # GNUPGHOME=~/.gnupg
 
 # GPG keyserver to search for keys.
 # 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
 
 # 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 6d57fc4b51a7a8dee648153806f6da9c3813071c..d3ba5e44f788f5b768e355e01bff73639c294616 100755 (executable)
--- 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"}}
 # 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"}}
 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"}}