From 5898489f25eb6c1c21f00dcfdd17545e12e414db Mon Sep 17 00:00:00 2001 From: Ben Hearsum Date: Mon, 30 Sep 2013 16:42:21 -0400 Subject: [PATCH] bug 885477: switch Nightly users to Balrog - default to aus3 unless we're in a NIGHTLY_BUILD. r=rstrong --HG-- rename : accessible/src/windows/ia2/ia2Accessible.cpp => accessible/src/windows/msaa/AccessibleWrap.cpp rename : accessible/src/windows/ia2/ia2Accessible.h => accessible/src/windows/msaa/AccessibleWrap.h rename : js/xpconnect/src/XPCShellImpl.cpp => js/xpconnect/shell/xpcshell.cpp extra : rebase_source : f6cb7be487206b6828b454ef5dac66810c5efe18 --- browser/app/profile/firefox.js | 14 ++++++++++++++ browser/metro/profile/metro.js | 13 +++++++++++++ 2 files changed, 27 insertions(+) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index d1f439e1a00..06a86aafc95 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -128,11 +128,21 @@ pref("app.update.cert.maxErrors", 5); // when the |app.update.cert.checkAttributes| preference is set to false. Also, // the |app.update.url.override| preference should ONLY be used for testing. // IMPORTANT! metro.js should also be updated for updates to certs.X.issuerName + +// Nightly builds have switched over to aus4.mozilla.org, but we don't want anything else to yet. +#ifdef NIGHTLY_BUILD pref("app.update.certs.1.issuerName", "CN=DigiCert Secure Server CA,O=DigiCert Inc,C=US"); pref("app.update.certs.1.commonName", "aus4.mozilla.org"); pref("app.update.certs.2.issuerName", "CN=Thawte SSL CA,O=\"Thawte, Inc.\",C=US"); pref("app.update.certs.2.commonName", "aus4.mozilla.org"); +#else +pref("app.update.certs.1.issuerName", "OU=Equifax Secure Certificate Authority,O=Equifax,C=US"); +pref("app.update.certs.1.commonName", "aus3.mozilla.org"); + +pref("app.update.certs.2.issuerName", "CN=Thawte SSL CA,O=\"Thawte, Inc.\",C=US"); +pref("app.update.certs.2.commonName", "aus3.mozilla.org"); +#endif // Whether or not app updates are enabled pref("app.update.enabled", true); @@ -162,7 +172,11 @@ pref("app.update.silent", false); pref("app.update.staging.enabled", true); // Update service URL: +#ifdef NIGHTLY_BUILD pref("app.update.url", "https://aus4.mozilla.org/update/3/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml"); +#else +pref("app.update.url", "https://aus3.mozilla.org/update/3/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml"); +#endif // app.update.url.manual is in branding section // app.update.url.details is in branding section diff --git a/browser/metro/profile/metro.js b/browser/metro/profile/metro.js index 7b1a7f12ec9..ce3c6fd468a 100644 --- a/browser/metro/profile/metro.js +++ b/browser/metro/profile/metro.js @@ -442,7 +442,11 @@ pref("app.update.silent", true); pref("app.update.staging.enabled", true); // Update service URL: +#ifdef NIGHTLY_BUILD pref("app.update.url", "https://aus4.mozilla.org/update/3/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml"); +#else +pref("app.update.url", "https://aus3.mozilla.org/update/3/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml"); +#endif // Show the Update Checking/Ready UI when the user was idle for x seconds pref("app.update.idletime", 60); @@ -510,10 +514,19 @@ pref("app.update.cert.maxErrors", 5); // when the |app.update.cert.checkAttributes| preference is set to false. Also, // the |app.update.url.override| preference should ONLY be used for testing. // IMPORTANT! firefox.js should also be updated for updates to certs.X.issuerName + +// Nightly builds have switched over to aus4.mozilla.org, but we don't want anything else to yet. +#ifdef NIGHTLY_BUILD pref("app.update.certs.1.issuerName", "CN=DigiCert Secure Server CA,O=DigiCert Inc,C=US"); pref("app.update.certs.1.commonName", "aus4.mozilla.org"); pref("app.update.certs.2.issuerName", "CN=Thawte SSL CA,O=\"Thawte, Inc.\",C=US"); pref("app.update.certs.2.commonName", "aus4.mozilla.org"); +#else +pref("app.update.certs.1.issuerName", "OU=Equifax Secure Certificate Authority,O=Equifax,C=US"); +pref("app.update.certs.1.commonName", "aus3.mozilla.org"); +pref("app.update.certs.2.issuerName", "CN=Thawte SSL CA,O=\"Thawte, Inc.\",C=US"); +pref("app.update.certs.2.commonName", "aus3.mozilla.org"); +#endif // User-settable override to app.update.url for testing purposes. //pref("app.update.url.override", "");