From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 2 Jul 2020 11:08:04 +0000 (+0200)
Subject: CentOS: Use mirrorlist.fedoraproject.org for EPEL mirrors
X-Git-Tag: v6~73^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F413%2Fhead;p=thirdparty%2Fmkosi.git

CentOS: Use mirrorlist.fedoraproject.org for EPEL mirrors
---

diff --git a/mkosi b/mkosi
index 472c142f9..a3946285e 100755
--- a/mkosi
+++ b/mkosi
@@ -1826,7 +1826,7 @@ def install_centos_old(args: CommandLineArguments,
         updates_url = f"mirrorlist=http://mirrorlist.centos.org/?release={args.release}&arch=x86_64&repo=updates"
         extras_url = f"mirrorlist=http://mirrorlist.centos.org/?release={args.release}&arch=x86_64&repo=extras"
         centosplus_url = f"mirrorlist=http://mirrorlist.centos.org/?release={args.release}&arch=x86_64&repo=centosplus"
-        epel_url = f"baseurl=http://download.fedoraproject.org/pub/epel/{epel_release}/x86_64"
+        epel_url = f"mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=epel-{epel_release}&arch=x86_64"
 
     with open(config_file, "w") as f:
         f.write(f"""\
@@ -1893,13 +1893,10 @@ def install_centos_new(args: CommandLineArguments,
         baseos_url = f"mirrorlist=http://mirrorlist.centos.org/?release={args.release}&arch=x86_64&repo=BaseOS"
         extras_url = f"mirrorlist=http://mirrorlist.centos.org/?release={args.release}&arch=x86_64&repo=extras"
         centosplus_url = f"mirrorlist=http://mirrorlist.centos.org/?release={args.release}&arch=x86_64&repo=centosplus"
-        epel_url = f"baseurl=http://download.fedoraproject.org/pub/epel/{epel_release}/Everything/x86_64"
+        epel_url = f"mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=epel-{epel_release}&arch=x86_64"
 
     with open(config_file, "w") as f:
         f.write(f"""\
-[main]
-gpgcheck=1
-
 [AppStream]
 name=CentOS-{args.release} - AppStream
 {appstream_url}