diff --git a/.etckeeper b/.etckeeper index 74c65d6..c24b7e1 100755 --- a/.etckeeper +++ b/.etckeeper @@ -2806,6 +2806,18 @@ maybe chgrp 'mock' 'mock/eol/fedora-31-s390x.cfg' maybe chmod 0644 'mock/eol/fedora-31-s390x.cfg' maybe chgrp 'mock' 'mock/eol/fedora-31-x86_64.cfg' maybe chmod 0644 'mock/eol/fedora-31-x86_64.cfg' +maybe chgrp 'mock' 'mock/eol/fedora-32-aarch64.cfg' +maybe chmod 0644 'mock/eol/fedora-32-aarch64.cfg' +maybe chgrp 'mock' 'mock/eol/fedora-32-armhfp.cfg' +maybe chmod 0644 'mock/eol/fedora-32-armhfp.cfg' +maybe chgrp 'mock' 'mock/eol/fedora-32-i386.cfg' +maybe chmod 0644 'mock/eol/fedora-32-i386.cfg' +maybe chgrp 'mock' 'mock/eol/fedora-32-ppc64le.cfg' +maybe chmod 0644 'mock/eol/fedora-32-ppc64le.cfg' +maybe chgrp 'mock' 'mock/eol/fedora-32-s390x.cfg' +maybe chmod 0644 'mock/eol/fedora-32-s390x.cfg' +maybe chgrp 'mock' 'mock/eol/fedora-32-x86_64.cfg' +maybe chmod 0644 'mock/eol/fedora-32-x86_64.cfg' maybe chgrp 'mock' 'mock/eol/mageia-6-armv5tl.cfg' maybe chmod 0644 'mock/eol/mageia-6-armv5tl.cfg' maybe chgrp 'mock' 'mock/eol/mageia-6-armv7hl.cfg' @@ -2867,18 +2879,6 @@ maybe chgrp 'mock' 'mock/epelplayground-8-ppc64le.cfg' maybe chmod 0644 'mock/epelplayground-8-ppc64le.cfg' maybe chgrp 'mock' 'mock/epelplayground-8-x86_64.cfg' maybe chmod 0644 'mock/epelplayground-8-x86_64.cfg' -maybe chgrp 'mock' 'mock/fedora-32-aarch64.cfg' -maybe chmod 0644 'mock/fedora-32-aarch64.cfg' -maybe chgrp 'mock' 'mock/fedora-32-armhfp.cfg' -maybe chmod 0644 'mock/fedora-32-armhfp.cfg' -maybe chgrp 'mock' 'mock/fedora-32-i386.cfg' -maybe chmod 0644 'mock/fedora-32-i386.cfg' -maybe chgrp 'mock' 'mock/fedora-32-ppc64le.cfg' -maybe chmod 0644 'mock/fedora-32-ppc64le.cfg' -maybe chgrp 'mock' 'mock/fedora-32-s390x.cfg' -maybe chmod 0644 'mock/fedora-32-s390x.cfg' -maybe chgrp 'mock' 'mock/fedora-32-x86_64.cfg' -maybe chmod 0644 'mock/fedora-32-x86_64.cfg' maybe chgrp 'mock' 'mock/fedora-33-aarch64.cfg' maybe chmod 0644 'mock/fedora-33-aarch64.cfg' maybe chgrp 'mock' 'mock/fedora-33-armhfp.cfg' @@ -4949,10 +4949,10 @@ maybe chmod 0640 'yum.repos.d/atomic.repo' maybe chmod 0640 'yum.repos.d/bestcrypt.repo' maybe chmod 0640 'yum.repos.d/docker-ce.repo' maybe chmod 0644 'yum.repos.d/elrepo.repo' -maybe chmod 0640 'yum.repos.d/epel-modular.repo' -maybe chmod 0640 'yum.repos.d/epel-playground.repo' -maybe chmod 0640 'yum.repos.d/epel-testing-modular.repo' -maybe chmod 0640 'yum.repos.d/epel-testing.repo' +maybe chmod 0644 'yum.repos.d/epel-modular.repo' +maybe chmod 0644 'yum.repos.d/epel-playground.repo' +maybe chmod 0644 'yum.repos.d/epel-testing-modular.repo' +maybe chmod 0644 'yum.repos.d/epel-testing.repo' maybe chmod 0644 'yum.repos.d/epel.repo' maybe chmod 0640 'yum.repos.d/immortal_immortal.repo' maybe chmod 0640 'yum.repos.d/lynis.repo' diff --git a/mock/fedora-32-aarch64.cfg b/mock/eol/fedora-32-aarch64.cfg similarity index 100% rename from mock/fedora-32-aarch64.cfg rename to mock/eol/fedora-32-aarch64.cfg diff --git a/mock/fedora-32-armhfp.cfg b/mock/eol/fedora-32-armhfp.cfg similarity index 100% rename from mock/fedora-32-armhfp.cfg rename to mock/eol/fedora-32-armhfp.cfg diff --git a/mock/fedora-32-i386.cfg b/mock/eol/fedora-32-i386.cfg similarity index 100% rename from mock/fedora-32-i386.cfg rename to mock/eol/fedora-32-i386.cfg diff --git a/mock/fedora-32-ppc64le.cfg b/mock/eol/fedora-32-ppc64le.cfg similarity index 100% rename from mock/fedora-32-ppc64le.cfg rename to mock/eol/fedora-32-ppc64le.cfg diff --git a/mock/fedora-32-s390x.cfg b/mock/eol/fedora-32-s390x.cfg similarity index 100% rename from mock/fedora-32-s390x.cfg rename to mock/eol/fedora-32-s390x.cfg diff --git a/mock/fedora-32-x86_64.cfg b/mock/eol/fedora-32-x86_64.cfg similarity index 100% rename from mock/fedora-32-x86_64.cfg rename to mock/eol/fedora-32-x86_64.cfg diff --git a/mock/templates/centos-stream-8.tpl b/mock/templates/centos-stream-8.tpl index ef39dd2..5dd440b 100644 --- a/mock/templates/centos-stream-8.tpl +++ b/mock/templates/centos-stream-8.tpl @@ -26,21 +26,30 @@ protected_packages= module_platform_id=platform:el8 user_agent={{ user_agent }} -[Stream-BaseOS] -name=CentOS-Stream - Base -baseurl=http://mirror.centos.org/centos/8-stream/BaseOS/$basearch/os/ +[baseos] +name=CentOS Stream $releasever - BaseOS +mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=BaseOS&infra=$infra +#baseurl=http://mirror.centos.org/$contentdir/$stream/BaseOS/$basearch/os/ failovermethod=priority gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official gpgcheck=1 skip_if_unavailable=False -[Stream-AppStream] -name=CentOS-Stream - AppStream -baseurl=http://mirror.centos.org/centos/8-stream/AppStream/$basearch/os/ +[appstream] +name=CentOS Stream $releasever - AppStream +mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=AppStream&infra=$infra +#baseurl=http://mirror.centos.org/$contentdir/$stream/AppStream/$basearch/os/ gpgcheck=1 enabled=1 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official +[debuginfo] +name=CentOS Stream $releasever - Debuginfo +baseurl=http://debuginfo.centos.org/$stream/$basearch/ +gpgcheck=1 +enabled=0 +gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official + [Stream-centosplus] name=CentOS-Stream - Plus baseurl=http://mirror.centos.org/centos/8-stream/centosplus/$basearch/os/ @@ -62,20 +71,38 @@ gpgcheck=1 enabled=0 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official -[Stream-extras] -name=CentOS-Stream - Extras -baseurl=http://mirror.centos.org/centos/8-stream/extras/$basearch/os/ +[extras] +name=CentOS Stream $releasever - Extras +mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=extras&infra=$infra +#baseurl=http://mirror.centos.org/$contentdir/$stream/extras/$basearch/os/ gpgcheck=1 enabled=1 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official -[Stream-PowerTools] -name=CentOS-Stream - PowerTools -baseurl=http://mirror.centos.org/centos/8-stream/PowerTools/$basearch/os/ +[powertools] +name=CentOS Stream $releasever - PowerTools +mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=PowerTools&infra=$infra +#baseurl=http://mirror.centos.org/$contentdir/$stream/PowerTools/$basearch/os/ gpgcheck=1 enabled=1 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official +[rt] +name=CentOS Stream $releasever - RealTime +mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=RT&infra=$infra +#baseurl=http://mirror.centos.org/$contentdir/$stream/RT/$basearch/os/ +gpgcheck=1 +enabled=0 +gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official + +[ha] +name=CentOS Stream $releasever - HighAvailability +mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=HighAvailability&infra=$infra +#baseurl=http://mirror.centos.org/$contentdir/$stream/HighAvailability/$basearch/os/ +gpgcheck=1 +enabled=0 +gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official + [Stream-Devel] name=CentOS-Stream - Devel WARNING! FOR BUILDROOT USE ONLY! baseurl=http://mirror.centos.org/centos/8-stream/Devel/$basearch/os/ diff --git a/mock/templates/opensuse-leap-15.3.tpl b/mock/templates/opensuse-leap-15.3.tpl index eab4444..14ff3e9 100644 --- a/mock/templates/opensuse-leap-15.3.tpl +++ b/mock/templates/opensuse-leap-15.3.tpl @@ -53,6 +53,8 @@ baseurl=http://download.opensuse.org/distribution/leap/$releasever/repo/oss/ #metalink=http://download.opensuse.org/distribution/leap/$releasever/repo/oss/repodata/repomd.xml.metalink enabled=1 gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE + file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE-Backports + file:///usr/share/distribution-gpg-keys/suse/RPM-GPG-KEY-SuSE-SLE-15 gpgcheck=1 [opensuse-leap-oss-update] @@ -63,4 +65,20 @@ enabled=1 gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE gpgcheck=1 +[opensuse-leap-sle-update] +name=openSUSE Leap $releasever - {{ target_arch }} - Updates from SUSE Linux Enterprise +baseurl=http://download.opensuse.org/update/leap/$releasever/sle/ +#metalink=http://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 - {{ target_arch }} - Updates from Backports for SUSE Linux Enterprise +baseurl=http://download.opensuse.org/update/leap/$releasever/backports/ +#metalink=http://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/yum.repos.d/epel-modular.repo b/yum.repos.d/epel-modular.repo index fd07f1c..58f6356 100644 --- a/yum.repos.d/epel-modular.repo +++ b/yum.repos.d/epel-modular.repo @@ -1,6 +1,8 @@ [epel-modular] name=Extra Packages for Enterprise Linux Modular $releasever - $basearch -#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Modular/$basearch +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/$releasever/Modular/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=1 gpgcheck=1 @@ -9,7 +11,9 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 [epel-modular-debuginfo] name=Extra Packages for Enterprise Linux Modular $releasever - $basearch - Debug -#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Modular/$basearch/debug +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/$releasever/Modular/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 @@ -17,7 +21,9 @@ gpgcheck=1 [epel-modular-source] name=Extra Packages for Enterprise Linux Modular $releasever - $basearch - Source -#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Modular/SRPMS +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/$releasever/Modular/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 diff --git a/yum.repos.d/epel-playground.repo b/yum.repos.d/epel-playground.repo index 6a22853..5c3077b 100644 --- a/yum.repos.d/epel-playground.repo +++ b/yum.repos.d/epel-playground.repo @@ -1,6 +1,8 @@ [epel-playground] name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch -#baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch/os +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/playground/$releasever/Everything/$basearch/os metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgcheck=1 @@ -9,7 +11,9 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 [epel-playground-debuginfo] name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Debug -#baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch/debug +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/playground/$releasever/Everything/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 @@ -17,7 +21,9 @@ gpgcheck=1 [epel-playground-source] name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Source -#baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/source/tree/ +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/playground/$releasever/Everything/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 diff --git a/yum.repos.d/epel-testing-modular.repo b/yum.repos.d/epel-testing-modular.repo index 25db528..f8e93b8 100644 --- a/yum.repos.d/epel-testing-modular.repo +++ b/yum.repos.d/epel-testing-modular.repo @@ -1,6 +1,8 @@ [epel-testing-modular] name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch -#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Modular/$basearch +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/testing/$releasever/Modular/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgcheck=1 @@ -9,7 +11,9 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 [epel-testing-modular-debuginfo] name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch - Debug -#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Modular/$basearch/debug +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/testing/$releasever/Modular/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 @@ -17,7 +21,9 @@ gpgcheck=1 [epel-testing-modular-source] name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch - Source -#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Modular/SRPMS +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/testing/$releasever/Modular/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 diff --git a/yum.repos.d/epel-testing.repo b/yum.repos.d/epel-testing.repo index b670f71..32fb7f3 100644 --- a/yum.repos.d/epel-testing.repo +++ b/yum.repos.d/epel-testing.repo @@ -1,6 +1,8 @@ [epel-testing] name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch -#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/$basearch +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/testing/$releasever/Everything/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgcheck=1 @@ -9,7 +11,9 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 [epel-testing-debuginfo] name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Debug -#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/$basearch/debug +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/testing/$releasever/Everything/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 @@ -17,7 +21,9 @@ gpgcheck=1 [epel-testing-source] name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Source -#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/SRPMS +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/testing/$releasever/Everything/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 diff --git a/yum.repos.d/epel.repo b/yum.repos.d/epel.repo index 61cd850..37e983e 100644 --- a/yum.repos.d/epel.repo +++ b/yum.repos.d/epel.repo @@ -1,6 +1,8 @@ [epel] name=Extra Packages for Enterprise Linux $releasever - $basearch -#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/$releasever/Everything/$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=1 gpgcheck=1 @@ -9,7 +11,9 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 [epel-debuginfo] name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug -#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch/debug +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/$releasever/Everything/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 @@ -17,7 +21,9 @@ gpgcheck=1 [epel-source] name=Extra Packages for Enterprise Linux $releasever - $basearch - Source -#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/SRPMS +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place it's address here. +#baseurl=https://download.example/pub/epel/$releasever/Everything/SRPMS metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8