From 3ffb8700a18309d6ffe994354cf2c0da1e438890 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Apr 01 2020 10:15:26 +0000
Subject: [PATCH 1/2] Use https URLs for download.fedoraproject.org


... and consistently use download.fedoraproject.org instead of
dl.fedoraproject.org everywhere.

---

diff --git a/config/fedora.yaml b/config/fedora.yaml
index 13177e8..ed5f447 100644
--- a/config/fedora.yaml
+++ b/config/fedora.yaml
@@ -28,33 +28,33 @@ data:
                 repositories:
                     fedora:
                         arch:
-                            baseurl: http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
+                            baseurl: https://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
                         source:
-                            baseurl: http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/source/tree/
+                            baseurl: https://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/source/tree/
                     updates:
                         arch:
-                            baseurl: http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/$basearch/
+                            baseurl: https://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/$basearch/
                         source:
-                            baseurl: http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/SRPMS/
+                            baseurl: https://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/SRPMS/
                     fedora-modular:
                         arch:
-                            baseurl: http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/$basearch/os/
+                            baseurl: https://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/$basearch/os/
                         source:
-                            baseurl: http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/source/tree/
+                            baseurl: https://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/source/tree/
                     fedora-modular-updates:
                         arch:
-                            baseurl: http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/$basearch/
+                            baseurl: https://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/$basearch/
                         source:
-                            baseurl: http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/SRPMS/
+                            baseurl: https://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/SRPMS/
             fedora-branched:
                 extends: fedora-base
                 repositories:
                     fedora:
-                        arch: https://dl.fedoraproject.org/pub/fedora/linux/development/$releasever/Everything/
-                        source: http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/source/tree/
+                        arch: https://download.fedoraproject.org/pub/fedora/linux/development/$releasever/Everything/
+                        source: https://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/source/tree/
                     fedora-modular:
-                        arch: https://dl.fedoraproject.org/pub/fedora/linux/development/$releasever/Modular/
-                        source: http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/source/tree/
+                        arch: https://download.fedoraproject.org/pub/fedora/linux/development/$releasever/Modular/
+                        source: https://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/source/tree/
         releases:
             f28:
                 template: fedora-stable
@@ -72,8 +72,8 @@ data:
                 template: fedora-base
                 repositories:
                     fedora:
-                        arch: https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/$basearch/os/
-                        source: http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/
+                        arch: https://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/$basearch/os/
+                        source: https://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/
                     fedora-modular:
-                        arch: https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Modular/$basearch/os/
-                        source: http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Modular/source/tree/
+                        arch: https://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Modular/$basearch/os/
+                        source: https://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Modular/source/tree/

From ef0ec9b869f65399c862765cc798850c8e26d35b Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Apr 21 2020 21:22:27 +0000
Subject: [PATCH 2/2] Add f32 branched dataset


While at this, also fix the branched URLs to actually work.

---

diff --git a/config/fedora.yaml b/config/fedora.yaml
index ed5f447..c249e93 100644
--- a/config/fedora.yaml
+++ b/config/fedora.yaml
@@ -50,11 +50,11 @@ data:
                 extends: fedora-base
                 repositories:
                     fedora:
-                        arch: https://download.fedoraproject.org/pub/fedora/linux/development/$releasever/Everything/
-                        source: https://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/source/tree/
+                        arch: https://download.fedoraproject.org/pub/fedora/linux/development/$releasever/Everything/$basearch/os/
+                        source: https://download.fedoraproject.org/pub/fedora/linux/development/$releasever/Everything/source/tree/
                     fedora-modular:
-                        arch: https://download.fedoraproject.org/pub/fedora/linux/development/$releasever/Modular/
-                        source: https://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/source/tree/
+                        arch: https://download.fedoraproject.org/pub/fedora/linux/development/$releasever/Modular/$basearch/os/
+                        source: https://download.fedoraproject.org/pub/fedora/linux/development/$releasever/Modular/source/tree/
         releases:
             f28:
                 template: fedora-stable
@@ -64,11 +64,13 @@ data:
                 template: fedora-stable
             f31:
                 template: fedora-stable
+            f32:
+                template: fedora-branched
             rawhide:
                 dataset-regex: rawhide
                 platform-module:
                     # nothing to match -> hardcode
-                    stream-template: f32
+                    stream-template: f33
                 template: fedora-base
                 repositories:
                     fedora: