From b9a3ddac0dfb60417109d9169bd417d1c7c151d3 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sun, 5 Jul 2020 19:15:34 +0300 Subject: libre/iceweasel: Update data reporting preference overrides Because data reporting is now hopefully disabled via build config options, reviewed some of the related preference overrides: Removed the following preferences: datareporting.healthreport.uploadEnabled defined only if MOZ_SERVICES_HEALTHREPORT is defined, see modules/libpref/init/all.js datareporting.healthreport.about.reportUrl Removed upstream, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1352497 Can be found only in some test files datareporting.healthreport.documentServerURI Probably have been removed too, documentServerURI can now be found only in obsolete documentation and some tests healthreport.uploadEnabled cannot be found alone in source tree. Only datareporting.healthreport.uploadEnabled can be found. datareporting.policy.dataSubmissionEnabled defined only if MOZ_DATA_REPORTING is defined, see modules/libpref/init/all.js datareporting.healthreport.service.enabled could find only in some test files datareporting.policy.firstRunTime datareporting.policy.dataSubmissionPolicyVersion could not find in source tree Also checked the following preferences: toolkit.telemetry* still available in the code, so have not removed them pref("toolkit.telemetry.server_owner", "User"); This is just a nitpicking probably, because upstream preference says "Mozilla" instead. And that is not true, because of the following override in vendor.js :) pref("toolkit.telemetry.server", "127.0.0.1"); Signed-off-by: Andreas Grapentin --- libre/iceweasel/vendor.js.in | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'libre/iceweasel/vendor.js.in') diff --git a/libre/iceweasel/vendor.js.in b/libre/iceweasel/vendor.js.in index a98f3d3a2..d67ae2fb0 100644 --- a/libre/iceweasel/vendor.js.in +++ b/libre/iceweasel/vendor.js.in @@ -149,13 +149,7 @@ pref("security.enterprise_roots.enabled", false); //pref("services.sync.privacyURL", "https://www.gnu.org/software/gnuzilla/"); pref("social.enabled", false); pref("social.remote-install.enabled", false); -pref("datareporting.healthreport.uploadEnabled", false); -pref("datareporting.healthreport.about.reportUrl", "127.0.0.1"); -pref("datareporting.healthreport.documentServerURI", "127.0.0.1"); -pref("healthreport.uploadEnabled", false); pref("social.toast-notifications.enabled", false); -pref("datareporting.policy.dataSubmissionEnabled", false); -pref("datareporting.healthreport.service.enabled", false); pref("browser.slowStartup.notificationDisabled", true); pref("network.http.sendRefererHeader", 2); //pref("network.http.referer.spoofSource", true); @@ -172,6 +166,7 @@ pref("toolkit.telemetry.unified", false); pref("toolkit.telemetry.newProfilePing.enabled", false); pref("toolkit.telemetry.firstShutdownPing.enabled", false); pref("toolkit.telemetry.server", "127.0.0.1"); +pref("toolkit.telemetry.server_owner", "User"); pref("app.shield.optoutstudies.enabled", false); pref("experiments.enabled", false); pref("experiments.manifest.uri", "127.0.0.1"); @@ -223,8 +218,6 @@ pref("identity.mobilepromo.android", "https://f-droid.org/repository/browse/?fdi pref("browser.snippets.geoUrl", "http://127.0.0.1/"); pref("browser.snippets.updateUrl", "http://127.0.0.1/"); pref("browser.snippets.statsUrl", "http://127.0.0.1/"); -pref("datareporting.policy.firstRunTime", 0); -pref("datareporting.policy.dataSubmissionPolicyVersion", 2); pref("browser.webapps.checkForUpdates", 0); pref("browser.webapps.updateCheckUrl", "http://127.0.0.1/"); pref("app.faqURL", "http://libreplanet.org/wiki/Group:IceCat/FAQ"); @@ -322,3 +315,9 @@ pref("browser.messaging-system.whatsNewPanel.enabled", false); // Disable 'Recommendations' section in about:addons // Related to: https://labs.parabola.nu/issues/2409 pref("extensions.getAddons.showPane", false); + +// Disable some bits of Normandy, subsystem that allows Mozilla to make changes remotely. +// Should be already disbled by setting MOZ_NORMANDY to False in build configuration. +// Setting these preferences just in case and to not frustrate users. +pref("app.normandy.api_url", "http://127.0.0.1/"); +pref("app.normandy.enabled", false); -- cgit v1.2.3