From f429b13a2557bbee5f3b14a4c86dba55874ed8d8 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Nov 23 2022 18:57:12 +0000
Subject: Cache metadata by default


Also consolidate the `metadata_expire=` config to the top levels and
remove the redundant `enabled=1` lines

Signed-off-by: Michel Alexandre Salim <salimma@fedoraproject.org>

---

diff --git a/distros/centos-stream-legacy.conf b/distros/centos-stream-legacy.conf
index a3352d6..15d3c09 100644
--- a/distros/centos-stream-legacy.conf
+++ b/distros/centos-stream-legacy.conf
@@ -8,7 +8,7 @@ obsoletes=1
 gpgcheck=0
 best=1
 install_weak_deps=0
-metadata_expire=0
+metadata_expire=6h
 mdpolicy=group:primary
 
 [Stream-BaseOS]
diff --git a/distros/centos-stream.conf b/distros/centos-stream.conf
index 1548b83..7f6e988 100644
--- a/distros/centos-stream.conf
+++ b/distros/centos-stream.conf
@@ -8,7 +8,7 @@ obsoletes=1
 gpgcheck=0
 best=1
 install_weak_deps=0
-metadata_expire=0
+metadata_expire=6h
 mdpolicy=group:primary
 
 [baseos]
@@ -17,7 +17,6 @@ metalink=https://mirrors.centos.org/metalink?repo=centos-baseos-$releasever-stre
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 gpgcheck=1
 repo_gpgcheck=0
-metadata_expire=6h
 countme=1
 enabled=1
 
@@ -27,7 +26,6 @@ metalink=https://mirrors.centos.org/metalink?repo=centos-baseos-debug-$releaseve
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 gpgcheck=1
 repo_gpgcheck=0
-metadata_expire=6h
 enabled=0
 
 [baseos-source]
@@ -36,7 +34,6 @@ metalink=https://mirrors.centos.org/metalink?repo=centos-baseos-source-$releasev
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 gpgcheck=1
 repo_gpgcheck=0
-metadata_expire=6h
 enabled=0
 
 [appstream]
@@ -45,7 +42,6 @@ metalink=https://mirrors.centos.org/metalink?repo=centos-appstream-$releasever-s
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 gpgcheck=1
 repo_gpgcheck=0
-metadata_expire=6h
 countme=1
 enabled=1
 
@@ -55,7 +51,6 @@ metalink=https://mirrors.centos.org/metalink?repo=centos-appstream-debug-$releas
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 gpgcheck=1
 repo_gpgcheck=0
-metadata_expire=6h
 enabled=0
 
 [appstream-source]
@@ -64,7 +59,6 @@ metalink=https://mirrors.centos.org/metalink?repo=centos-appstream-source-$relea
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 gpgcheck=1
 repo_gpgcheck=0
-metadata_expire=6h
 enabled=0
 
 [crb]
@@ -73,7 +67,6 @@ metalink=https://mirrors.centos.org/metalink?repo=centos-crb-$releasever-stream&
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 gpgcheck=1
 repo_gpgcheck=0
-metadata_expire=6h
 countme=1
 enabled=1
 
@@ -83,7 +76,6 @@ metalink=https://mirrors.centos.org/metalink?repo=centos-crb-debug-$releasever-s
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 gpgcheck=1
 repo_gpgcheck=0
-metadata_expire=6h
 enabled=0
 
 [crb-source]
@@ -92,7 +84,6 @@ metalink=https://mirrors.centos.org/metalink?repo=centos-crb-source-$releasever-
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 gpgcheck=1
 repo_gpgcheck=0
-metadata_expire=6h
 enabled=0
 
 [highavailability]
@@ -101,7 +92,6 @@ metalink=https://mirrors.centos.org/metalink?repo=centos-highavailability-$relea
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 gpgcheck=1
 repo_gpgcheck=0
-metadata_expire=6h
 countme=1
 enabled=0
 
@@ -111,7 +101,6 @@ metalink=https://mirrors.centos.org/metalink?repo=centos-highavailability-debug-
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 gpgcheck=1
 repo_gpgcheck=0
-metadata_expire=6h
 enabled=0
 
 [highavailability-source]
@@ -120,7 +109,6 @@ metalink=https://mirrors.centos.org/metalink?repo=centos-highavailability-source
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 gpgcheck=1
 repo_gpgcheck=0
-metadata_expire=6h
 enabled=0
 
 [nfv]
@@ -129,7 +117,6 @@ metalink=https://mirrors.centos.org/metalink?repo=centos-nfv-$releasever-stream&
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 gpgcheck=1
 repo_gpgcheck=0
-metadata_expire=6h
 countme=1
 enabled=0
 
@@ -139,7 +126,6 @@ metalink=https://mirrors.centos.org/metalink?repo=centos-nfv-debug-$releasever-s
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 gpgcheck=1
 repo_gpgcheck=0
-metadata_expire=6h
 enabled=0
 
 [nfv-source]
@@ -148,7 +134,6 @@ metalink=https://mirrors.centos.org/metalink?repo=centos-nfv-source-$releasever-
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 gpgcheck=1
 repo_gpgcheck=0
-metadata_expire=6h
 enabled=0
 
 [rt]
@@ -157,7 +142,6 @@ metalink=https://mirrors.centos.org/metalink?repo=centos-rt-$releasever-stream&a
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 gpgcheck=1
 repo_gpgcheck=0
-metadata_expire=6h
 countme=1
 enabled=0
 
@@ -167,7 +151,6 @@ metalink=https://mirrors.centos.org/metalink?repo=centos-rt-debug-$releasever-st
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 gpgcheck=1
 repo_gpgcheck=0
-metadata_expire=6h
 enabled=0
 
 [rt-source]
@@ -176,7 +159,6 @@ metalink=https://mirrors.centos.org/metalink?repo=centos-rt-source-$releasever-s
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 gpgcheck=1
 repo_gpgcheck=0
-metadata_expire=6h
 enabled=0
 
 [resilientstorage]
@@ -185,7 +167,6 @@ metalink=https://mirrors.centos.org/metalink?repo=centos-resilientstorage-$relea
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 gpgcheck=1
 repo_gpgcheck=0
-metadata_expire=6h
 countme=1
 enabled=0
 
@@ -195,7 +176,6 @@ metalink=https://mirrors.centos.org/metalink?repo=centos-resilientstorage-debug-
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 gpgcheck=1
 repo_gpgcheck=0
-metadata_expire=6h
 enabled=0
 
 [resilientstorage-source]
@@ -204,13 +184,11 @@ metalink=https://mirrors.centos.org/metalink?repo=centos-resilientstorage-source
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 gpgcheck=1
 repo_gpgcheck=0
-metadata_expire=6h
 enabled=0
 
 [epel]
 name=Extra Packages for Enterprise Linux $releasever - $basearch
 metalink=http://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch
-enabled=1
 gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever
 gpgcheck=1
 skip_if_unavailable=False
@@ -218,7 +196,6 @@ skip_if_unavailable=False
 [epel-next]
 name=Extra Packages for Enterprise Linux $releasever - Next - $basearch
 metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-next-$releasever&arch=$basearch
-enabled=1
 gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-$releasever
 gpgcheck=1
 skip_if_unavailable=False
diff --git a/distros/centos.conf b/distros/centos.conf
index 4e5cf3a..c8ba6a8 100644
--- a/distros/centos.conf
+++ b/distros/centos.conf
@@ -8,7 +8,7 @@ obsoletes=1
 gpgcheck=0
 best=1
 install_weak_deps=0
-metadata_expire=0
+metadata_expire=6h
 mdpolicy=group:primary
 
 [BaseOS]
diff --git a/distros/fedora.conf b/distros/fedora.conf
index 9b0b607..278b968 100644
--- a/distros/fedora.conf
+++ b/distros/fedora.conf
@@ -8,7 +8,7 @@ obsoletes=1
 gpgcheck=0
 best=1
 install_weak_deps=0
-metadata_expire=0
+metadata_expire=6h
 mdpolicy=group:primary
 
 # repos
diff --git a/distros/mageia.conf b/distros/mageia.conf
index ae22679..9d51521 100644
--- a/distros/mageia.conf
+++ b/distros/mageia.conf
@@ -8,7 +8,7 @@ obsoletes=1
 gpgcheck=0
 best=1
 install_weak_deps=0
-metadata_expire=0
+metadata_expire=6h
 mdpolicy=group:primary
 
 # repos
diff --git a/distros/opensuse-leap-legacy.conf b/distros/opensuse-leap-legacy.conf
index fb47778..134058c 100644
--- a/distros/opensuse-leap-legacy.conf
+++ b/distros/opensuse-leap-legacy.conf
@@ -8,7 +8,7 @@ obsoletes=1
 gpgcheck=0
 best=1
 install_weak_deps=0
-metadata_expire=0
+metadata_expire=6h
 mdpolicy=group:primary
 
 # repos
diff --git a/distros/opensuse-leap.conf b/distros/opensuse-leap.conf
index 790ddd9..03e93e6 100644
--- a/distros/opensuse-leap.conf
+++ b/distros/opensuse-leap.conf
@@ -8,7 +8,7 @@ obsoletes=1
 gpgcheck=0
 best=1
 install_weak_deps=0
-metadata_expire=0
+metadata_expire=6h
 mdpolicy=group:primary
 
 # repos
@@ -31,13 +31,11 @@ repo_gpgcheck=1
 [opensuse-leap-sle-update]
 name=openSUSE Leap $releasever - Updates from SUSE Linux Enterprise
 metalink=https://download.opensuse.org/update/leap/$releasever/sle/repodata/repomd.xml.metalink
-enabled=1
 gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-SuSE-SLE-15
 gpgcheck=1
 
 [opensuse-leap-sle-backports-update]
 name=openSUSE Leap $releasever - Updates from Backports for SUSE Linux Enterprise
 metalink=https://download.opensuse.org/update/leap/$releasever/backports/repodata/repomd.xml.metalink
-enabled=1
 gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE-Backports
 gpgcheck=1
diff --git a/distros/opensuse-leap15-legacy.conf b/distros/opensuse-leap15-legacy.conf
index 31a92cf..be86c28 100644
--- a/distros/opensuse-leap15-legacy.conf
+++ b/distros/opensuse-leap15-legacy.conf
@@ -8,7 +8,7 @@ obsoletes=1
 gpgcheck=0
 best=1
 install_weak_deps=0
-metadata_expire=0
+metadata_expire=6h
 mdpolicy=group:primary
 
 # repos
diff --git a/distros/opensuse-tumbleweed-snapshot.conf b/distros/opensuse-tumbleweed-snapshot.conf
index 3cd7b43..37c5fee 100644
--- a/distros/opensuse-tumbleweed-snapshot.conf
+++ b/distros/opensuse-tumbleweed-snapshot.conf
@@ -8,7 +8,7 @@ obsoletes=1
 gpgcheck=0
 best=1
 install_weak_deps=0
-metadata_expire=0
+metadata_expire=6h
 mdpolicy=group:primary
 
 # repos
diff --git a/distros/opensuse-tumbleweed.conf b/distros/opensuse-tumbleweed.conf
index 0e45ad3..0ce4927 100644
--- a/distros/opensuse-tumbleweed.conf
+++ b/distros/opensuse-tumbleweed.conf
@@ -8,7 +8,7 @@ obsoletes=1
 gpgcheck=0
 best=1
 install_weak_deps=0
-metadata_expire=0
+metadata_expire=6h
 mdpolicy=group:primary
 
 # repos
diff --git a/distros/rhel-ubi.conf b/distros/rhel-ubi.conf
index 59c022f..d804408 100644
--- a/distros/rhel-ubi.conf
+++ b/distros/rhel-ubi.conf
@@ -8,13 +8,12 @@ obsoletes=1
 gpgcheck=0
 best=1
 install_weak_deps=0
-metadata_expire=0
+metadata_expire=6h
 mdpolicy=group:primary
 
 [ubi-baseos]
 name=Red Hat Universal Base Image $releasever (RPMs) - BaseOS
 baseurl=https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi$releasever/$releasever/$basearch/baseos/os
-enabled=1
 gpgkey=file:///usr/share/distribution-gpg-keys/redhat/RPM-GPG-KEY-redhat$releasever-release
 gpgcheck=1
 
@@ -35,7 +34,6 @@ gpgcheck=1
 [ubi-appstream]
 name=Red Hat Universal Base Image $releasever (RPMs) - AppStream
 baseurl=https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi$releasever/$releasever/$basearch/appstream/os
-enabled=1
 gpgkey=file:///usr/share/distribution-gpg-keys/redhat/RPM-GPG-KEY-redhat$releasever-release
 gpgcheck=1
 
@@ -56,7 +54,6 @@ gpgcheck=1
 [ubi-codeready-builder]
 name=Red Hat Universal Base Image $releasever (RPMs) - CodeReady Builder
 baseurl=https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi$releasever/$releasever/$basearch/codeready-builder/os
-enabled=1
 gpgkey=file:///usr/share/distribution-gpg-keys/redhat/RPM-GPG-KEY-redhat$releasever-release
 gpgcheck=1
 
diff --git a/distros/sle-bci.conf b/distros/sle-bci.conf
index 04ad910..bf66853 100644
--- a/distros/sle-bci.conf
+++ b/distros/sle-bci.conf
@@ -8,13 +8,12 @@ obsoletes=1
 gpgcheck=0
 best=1
 install_weak_deps=0
-metadata_expire=0
+metadata_expire=6h
 mdpolicy=group:primary
 
 # repos
 [SLE_BCI]
 name=SUSE Linux Enterprise $releasever - Base Container Image
 baseurl=https://updates.suse.com/SUSE/Products/SLE-BCI/$releaseversp/$basearch/product/
-enabled=1
 gpgkey=file:///usr/share/distribution-gpg-keys/suse/RPM-GPG-KEY-SuSE-SLE-$releasever
 gpgcheck=1