From 29336dbfef8aafecd34559ef9dd61f8ad30cbe16 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Feb 18 2020 17:56:46 +0000
Subject: Re-add baseurl lines, but using example domain


This sorta reverts f30862ce, because it turns out various people
(including me!) actually rely on these commented-out baseurl
lines in various ways. I (in openQA tests) and at least one other
person (hiredman on IRC), for e.g., use them as a base to modify
by changing the host, but keeping the path component, to use a
specific host that is known to always be a fast local one in a
particular environment and avoid the overhead of the metalink/
mirrorlist system.

To avoid encouraging the use of the download.fedoraproject.org
redirect system (as was the original intent), we replace the
hostname with an example one, so the line clearly cannot be used
as-is just by removing the #. We *could* also add a couple of
comment lines specifically discouraging people from using baseurl
unless they're very sure it's what they need, but I don't know
if it's necessary.

Signed-off-by: Adam Williamson <awilliam@redhat.com>

---

diff --git a/fedora-modular.repo b/fedora-modular.repo
index e7c436e..5aa9c26 100644
--- a/fedora-modular.repo
+++ b/fedora-modular.repo
@@ -1,5 +1,6 @@
 [fedora-modular]
 name=Fedora Modular $releasever - $basearch
+#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Modular/$basearch/os/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch
 enabled=0
 countme=1
@@ -12,6 +13,7 @@ skip_if_unavailable=False
 
 [fedora-modular-debuginfo]
 name=Fedora Modular $releasever - $basearch - Debug
+#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Modular/$basearch/debug/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-debug-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
@@ -23,6 +25,7 @@ skip_if_unavailable=False
 
 [fedora-modular-source]
 name=Fedora Modular $releasever - Source
+#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Modular/source/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-source-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
diff --git a/fedora-rawhide-modular.repo b/fedora-rawhide-modular.repo
index 25548ac..5646313 100644
--- a/fedora-rawhide-modular.repo
+++ b/fedora-rawhide-modular.repo
@@ -21,6 +21,7 @@
 
 [rawhide-modular]
 name=Fedora - Modular Rawhide - Developmental packages for the next Fedora release
+#baseurl=http://download.example/pub/fedora/linux/development/rawhide/Modular/$basearch/os/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular&arch=$basearch
 enabled=1
 countme=1
@@ -33,6 +34,7 @@ skip_if_unavailable=False
 
 [rawhide-modular-debuginfo]
 name=Fedora - Modular Rawhide - Debug
+#baseurl=http://download.example/pub/fedora/linux/development/rawhide/Modular/$basearch/debug/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular-debug&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -43,6 +45,7 @@ skip_if_unavailable=False
 
 [rawhide-modular-source]
 name=Fedora - Modular Rawhide - Source
+#baseurl=http://download.example/pub/fedora/linux/development/rawhide/Modular/source/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular-source&arch=$basearch
 enabled=0
 repo_gpgcheck=0
diff --git a/fedora-rawhide.repo b/fedora-rawhide.repo
index 7fb162c..2e649e6 100644
--- a/fedora-rawhide.repo
+++ b/fedora-rawhide.repo
@@ -21,6 +21,7 @@
 
 [rawhide]
 name=Fedora - Rawhide - Developmental packages for the next Fedora release
+#baseurl=http://download.example/pub/fedora/linux/development/rawhide//Everything/$basearch/os/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
 enabled=1
 countme=1
@@ -33,6 +34,7 @@ skip_if_unavailable=False
 
 [rawhide-debuginfo]
 name=Fedora - Rawhide - Debug
+#baseurl=http://download.example/pub/fedora/linux/development/rawhide/Everything/$basearch/debug/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-debug&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -43,6 +45,7 @@ skip_if_unavailable=False
 
 [rawhide-source]
 name=Fedora - Rawhide - Source
+#baseurl=http://download.example/pub/fedora/linux/development/rawhide/Everything/source/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-source&arch=$basearch
 enabled=0
 repo_gpgcheck=0
diff --git a/fedora-updates-modular.repo b/fedora-updates-modular.repo
index b73258f..37e4b71 100644
--- a/fedora-updates-modular.repo
+++ b/fedora-updates-modular.repo
@@ -1,5 +1,6 @@
 [updates-modular]
 name=Fedora Modular $releasever - $basearch - Updates
+#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/$basearch/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-f$releasever&arch=$basearch
 enabled=0
 countme=1
@@ -12,6 +13,7 @@ skip_if_unavailable=False
 
 [updates-modular-debuginfo]
 name=Fedora Modular $releasever - $basearch - Updates - Debug
+#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/$basearch/debug/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-debug-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -23,6 +25,7 @@ skip_if_unavailable=False
 
 [updates-modular-source]
 name=Fedora Modular $releasever - Updates Source
+#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/SRPMS/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-source-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
diff --git a/fedora-updates-testing-modular.repo b/fedora-updates-testing-modular.repo
index 9dcedbb..5cd78af 100644
--- a/fedora-updates-testing-modular.repo
+++ b/fedora-updates-testing-modular.repo
@@ -1,5 +1,6 @@
 [updates-testing-modular]
 name=Fedora Modular $releasever - $basearch - Test Updates
+#baseurl=http://download.example/pub/fedora/linux/updates/testing/$releasever/Modular/$basearch/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-f$releasever&arch=$basearch
 enabled=0
 countme=1
@@ -12,6 +13,7 @@ skip_if_unavailable=False
 
 [updates-testing-modular-debuginfo]
 name=Fedora Modular $releasever - $basearch - Test Updates Debug
+#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/$basearch/debug/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-debug-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -23,6 +25,7 @@ skip_if_unavailable=False
 
 [updates-testing-modular-source]
 name=Fedora Modular $releasever - Test Updates Source
+#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/SRPMS/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-source-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
diff --git a/fedora-updates-testing.repo b/fedora-updates-testing.repo
index db00456..9306abb 100644
--- a/fedora-updates-testing.repo
+++ b/fedora-updates-testing.repo
@@ -1,5 +1,6 @@
 [updates-testing]
 name=Fedora $releasever - $basearch - Test Updates
+#baseurl=http://download.example/pub/fedora/linux/updates/testing/$releasever/Everything/$basearch/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
 enabled=0
 countme=1
@@ -12,6 +13,7 @@ skip_if_unavailable=False
 
 [updates-testing-debuginfo]
 name=Fedora $releasever - $basearch - Test Updates Debug
+#baseurl=http://download.example/pub/fedora/linux/updates/testing/$releasever/Everything/$basearch/debug/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -23,6 +25,7 @@ skip_if_unavailable=False
 
 [updates-testing-source]
 name=Fedora $releasever - Test Updates Source
+#baseurl=http://download.example/pub/fedora/linux/updates/testing/$releasever/Everything/SRPMS/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-source-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
diff --git a/fedora-updates.repo b/fedora-updates.repo
index 3691dc4..9992c83 100644
--- a/fedora-updates.repo
+++ b/fedora-updates.repo
@@ -1,5 +1,6 @@
 [updates]
 name=Fedora $releasever - $basearch - Updates
+#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/$basearch/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
 enabled=0
 countme=1
@@ -12,6 +13,7 @@ skip_if_unavailable=False
 
 [updates-debuginfo]
 name=Fedora $releasever - $basearch - Updates - Debug
+#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/$basearch/debug/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -23,6 +25,7 @@ skip_if_unavailable=False
 
 [updates-source]
 name=Fedora $releasever - Updates Source
+#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/SRPMS/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
diff --git a/fedora.repo b/fedora.repo
index 3e59790..b39369e 100644
--- a/fedora.repo
+++ b/fedora.repo
@@ -1,5 +1,6 @@
 [fedora]
 name=Fedora $releasever - $basearch
+#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
 enabled=0
 countme=1
@@ -12,6 +13,7 @@ skip_if_unavailable=False
 
 [fedora-debuginfo]
 name=Fedora $releasever - $basearch - Debug
+#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
@@ -23,6 +25,7 @@ skip_if_unavailable=False
 
 [fedora-source]
 name=Fedora $releasever - Source
+#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/source/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d