kgpg: update list of keyservers

From: Rolf Eike Beer <kde@opensource.sf-tec.de>
Date: Wed, 25 Mar 2015 20:36:07 +0000
Subject: update list of keyservers
X-Git-Tag: v15.03.97
X-Git-Url: http://quickgit.kde.org/?p=kgpg.git&a=commitdiff&h=bb6eec0a50b10b633e90d096bc8c395c5cabf2ae
---
update list of keyservers

-add sks-keyservers.net as default, they seem to be more reliable than the
other rotations
-sync the lists between C++ and config template
---

diff --git a/kgpg/kgpg.kcfg b/kgpg/kgpg.kcfg
index c38b3ae..7604ba1 100644 (file)
--- a/kgpg/kgpg.kcfg
+++ b/kgpg/kgpg.kcfg
@@ -246,7 +246,7 @@
        <group name="Servers">
                <entry name="KeyServers" type="StringList" key="Server_List">
                        <label>Key servers used by KGpg. The first server in the list is the default server.</label>
-                       <default>hkp://wwwkeys.pgp.net,hkp://pgp.dtype.org,hkp://search.keyserver.net,hkp://subkeys.pgp.net,hkp://wwwkeys.pgp.net,hkp://wwwkeys.us.pgp.net</default>
+                       <default>hkp://pool.sks-keyservers.net,hkp://subkeys.pgp.net,hkp://search.keyserver.net,hkp://pgp.dtype.org,hkp://wwwkeys.pgp.net</default>
                </entry>
                <entry name="InfoServers" type="StringList" key="Info_Server_List">
                        <label>List of URLs that show details and analysis of the given key. The first server in the list is the default server.</label>

diff --git a/kgpg/kgpgoptions.cpp b/kgpg/kgpgoptions.cpp
index 9bdcf59..ea12e4b 100644 (file)
--- a/kgpg/kgpgoptions.cpp
+++ b/kgpg/kgpgoptions.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2002 Jean-Baptiste Mardelle <bj@altern.org>
- * Copyright (C) 2006,2007,2008,2009,2010,2011,2012,2013,2014
+ * Copyright (C) 2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
  *               Rolf Eike Beer <kde@opensource.sf-tec.de>
  */
 /***************************************************************************
@@ -62,11 +62,12 @@ kgpgOptions::kgpgOptions(QWidget *parent, KGpgItemModel *model)
        m_combomodel->sort(0);
 
        // Initialize the default server and the default server list.
-       defaultKeyServer = QLatin1String("hkp://wwwkeys.pgp.net");
+       defaultKeyServer = QLatin1String("hkp://pool.sks-keyservers.net");
        defaultServerList << defaultKeyServer
+                       << QLatin1String("hkp://subkeys.pgp.net")
                        << QLatin1String("hkp://search.keyserver.net")
                        << QLatin1String("hkp://pgp.dtype.org")
-                       << QLatin1String("hkp://subkeys.pgp.net");
+                       << QLatin1String("hkp://wwwkeys.pgp.net");
 
        // Read the default keyserver from the GnuPG settings.
        keyServer = KgpgInterface::getGpgSetting(QLatin1String( "keyserver" ), KGpgSettings::gpgConfigPath());