Adding upstream version 124.0.1.upstream/124.0.1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 70 insertions, 0 deletions

diff --git a/services/settings/static-dumps/main/doh-config.json b/services/settings/static-dumps/main/doh-config.json
new file mode 100644
index 0000000000..030fa75569
--- /dev/null
+++ b/services/settings/static-dumps/main/doh-config.json
@@ -0,0 +1,15 @@
+{
+  "data": [
+    {
+      "providers": "cloudflare-global, nextdns-global",
+      "rolloutEnabled": false,
+      "steeringEnabled": false,
+      "steeringProviders": "",
+      "autoDefaultEnabled": false,
+      "autoDefaultProviders": "",
+      "id": "global",
+      "last_modified": 1621943462970
+    }
+  ],
+  "timestamp": 1621943462970
+}
diff --git a/services/settings/static-dumps/main/doh-providers.json b/services/settings/static-dumps/main/doh-providers.json
new file mode 100644
index 0000000000..b2e62b7b01
--- /dev/null
+++ b/services/settings/static-dumps/main/doh-providers.json
@@ -0,0 +1,23 @@
+{
+  "data": [
+    {
+      "uri": "https://firefox.dns.nextdns.io/",
+      "UIName": "NextDNS",
+      "schema": 1621819183640,
+      "autoDefault": false,
+      "canonicalName": "",
+      "id": "nextdns-global",
+      "last_modified": 1621943542621
+    },
+    {
+      "uri": "https://mozilla.cloudflare-dns.com/dns-query",
+      "UIName": "Cloudflare",
+      "schema": 1621819221428,
+      "autoDefault": true,
+      "canonicalName": "",
+      "id": "cloudflare-global",
+      "last_modified": 1621943542615
+    }
+  ],
+  "timestamp": 1621943542621
+}
diff --git a/services/settings/static-dumps/main/moz.build b/services/settings/static-dumps/main/moz.build
new file mode 100644
index 0000000000..cc7658a22a
--- /dev/null
+++ b/services/settings/static-dumps/main/moz.build
@@ -0,0 +1,11 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+FINAL_TARGET_FILES.defaults.settings.main += [
+    "doh-config.json",
+    "doh-providers.json",
+]
+
+if CONFIG["MOZ_BUILD_APP"] == "browser":
+    DIST_SUBDIR = "browser"
diff --git a/services/settings/static-dumps/moz.build b/services/settings/static-dumps/moz.build
new file mode 100644
index 0000000000..557c1d80d9
--- /dev/null
+++ b/services/settings/static-dumps/moz.build
@@ -0,0 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DIRS += [
+    "main",
+]
diff --git a/services/settings/static-dumps/readme.md b/services/settings/static-dumps/readme.md
new file mode 100644
index 0000000000..dca1096fe1
--- /dev/null
+++ b/services/settings/static-dumps/readme.md
@@ -0,0 +1,14 @@
+# Remote Settings Initial Data
+
+In order to reduce the amount of data to be downloaded on first synchronization,
+a JSON dump from the records present on the remote server can be shipped with the
+release.
+
+The dumps in this directory will NOT automaticaly be kept in sync with remote.
+This is useful for collections that benefit from a default iniital state but
+require dynamism beyond that - e.g. DoH regional configurations. For dumps
+that should automatially be kept in sync with remote, use ../dumps/.
+
+Dumps from dumps/ and static-dumps/ are packaged into the same resource path,
+thus looking the same to the client code and also implying that filenames must
+be unique between the two directories.