aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Brunschwig <[email protected]>2019-07-06 16:37:45 +0200
committerPatrick Brunschwig <[email protected]>2019-07-06 16:37:45 +0200
commit5868fa72d3d04e73258a7f1417bd8552bf3e60e3 (patch)
tree05aa48f17c08d7f1dd267e2a53d3e63e98c5e99a
parentd237c472741500f34b318668e317b1087b28c759 (diff)
downloadenigmail-5868fa72d3d04e73258a7f1417bd8552bf3e60e3.tar.gz
enigmail-5868fa72d3d04e73258a7f1417bd8552bf3e60e3.tar.bz2
enigmail-5868fa72d3d04e73258a7f1417bd8552bf3e60e3.zip
set default keyserver to keys.openpgp.org
-rw-r--r--package/configure.jsm18
-rwxr-xr-xpackage/prefs/defaultPrefs.js4
2 files changed, 20 insertions, 2 deletions
diff --git a/package/configure.jsm b/package/configure.jsm
index c2f5992b..61ae37b8 100644
--- a/package/configure.jsm
+++ b/package/configure.jsm
@@ -182,6 +182,17 @@ function displayUpgradeInfo() {
catch (ex) {}
}
+function setDefaultKeyServer() {
+ EnigmailLog.DEBUG("configure.jsm: setDefaultKeyServer()\n");
+
+ let ks = EnigmailPrefs.getPref("keyserver");
+
+ if (ks.search(/^ldaps?:\/\//) < 0) {
+ ks = "hkps://keys.openpgp.org, " + ks;
+ EnigmailPrefs.setPref("keyserver", ks);
+ }
+}
+
var EnigmailConfigure = {
configureEnigmail: function(win, startingPreferences) {
@@ -261,6 +272,9 @@ var EnigmailConfigure = {
if (vc.compare(oldVer, "2.0.1a2pre") < 0) {
this.upgradeTo201();
}
+ if (vc.compare(oldVer, "2.0.12") < 0) {
+ this.upgradeTo_2_0_12();
+ }
}
EnigmailPrefs.setPref("configuredVersion", EnigmailApp.getVersion());
@@ -275,5 +289,9 @@ var EnigmailConfigure = {
upgradeTo201: function() {
setAutocryptForOldAccounts();
+ },
+
+ upgradeTo_2_0_12: function() {
+ setDefaultKeyServer();
}
};
diff --git a/package/prefs/defaultPrefs.js b/package/prefs/defaultPrefs.js
index a1f031e1..819425c8 100755
--- a/package/prefs/defaultPrefs.js
+++ b/package/prefs/defaultPrefs.js
@@ -97,7 +97,7 @@ pref("extensions.enigmail.keyManShowAllKeys", true);
// list of keyservers to use
-pref("extensions.enigmail.keyserver", "hkps://hkps.pool.sks-keyservers.net, hkps://keys.mailvelope.com, hkps://pgp.mit.edu");
+pref("extensions.enigmail.keyserver", "hkps://keys.openpgp.org, hkps://keys.mailvelope.com, hkps://hkps.pool.sks-keyservers.net");
// auto select the first keyserver in the key server list
pref("extensions.enigmail.autoKeyServerSelection", true);
@@ -294,4 +294,4 @@ pref("mail.identity.default.mimePreferOpenPGP", 1);
pref("mailnews.send_plaintext_flowed", false);
// disable loading of IMAP parts on demand
-pref("mail.server.default.mime_parts_on_demand", false);
+pref("mail.server.default.mime_parts_on_demand", false); \ No newline at end of file