Reorganizing YUM repos

diff --git a/yum.repos/epel-testing.repo b/yum.repos/epel-testing.repo
index 87c07b825a2df48a7d615c5e6bb33c95e7c2584b..6d3e8f1f8b911e88f4219d579a89d17786a27d00 100644 (file)
--- a/yum.repos/epel-testing.repo
+++ b/yum.repos/epel-testing.repo
@@ -1,31 +1,28 @@
 [epel-testing]
 name=Extra Packages for Enterprise Linux 7 - Testing - $basearch 
 #baseurl=http://download.fedoraproject.org/pub/epel/testing/7/$basearch
-metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel7&arch=$basearch
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=testing-epel7&arch=$basearch
 failovermethod=priority
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
-baseurl=https://download.fedoraproject.org/pub/epel/testing/7/$basearch
 
 [epel-testing-debuginfo]
 name=Extra Packages for Enterprise Linux 7 - Testing - $basearch - Debug
 #baseurl=http://download.fedoraproject.org/pub/epel/testing/7/$basearch/debug
-metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel7&arch=$basearch
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel7&arch=$basearch
 failovermethod=priority
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
 gpgcheck=1
-baseurl=https://download.fedoraproject.org/pub/epel/testing/7/$basearch/debug
 
 [epel-testing-source]
 name=Extra Packages for Enterprise Linux 7 - Testing - $basearch - Source
 #baseurl=http://download.fedoraproject.org/pub/epel/testing/7/SRPMS
-metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel7&arch=$basearch
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel7&arch=$basearch
 failovermethod=priority
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
 gpgcheck=1
-baseurl=https://download.fedoraproject.org/pub/epel/testing/7/SRPMS
 
 # vim: filetype=dosini

diff --git a/yum.repos/epel.repo b/yum.repos/epel.repo
index 0c762688c3444cb822333630854ae95fc3fb85d6..397d9d1ecc652ddfad81939e0667069502a279b5 100644 (file)
--- a/yum.repos/epel.repo
+++ b/yum.repos/epel.repo
@@ -1,8 +1,7 @@
 [epel]
 name=Extra Packages for Enterprise Linux 7 - $basearch
 #baseurl=http://download.fedoraproject.org/pub/epel/7/$basearch
-baseurl=https://repo.pixelpark.com/Linux/yum/epel/7/$basearch
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch
+baseurl=https://repo01.pixelpark.com/Linux/yum/epel/7/$basearch
 failovermethod=priority
 enabled=1
 gpgcheck=1
@@ -11,22 +10,19 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
 [epel-debuginfo]
 name=Extra Packages for Enterprise Linux 7 - $basearch - Debug
 #baseurl=http://download.fedoraproject.org/pub/epel/7/$basearch/debug
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-7&arch=$basearch
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-7&arch=$basearch
 failovermethod=priority
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
 gpgcheck=1
-mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-7&arch=$basearch
 
 [epel-source]
 name=Extra Packages for Enterprise Linux 7 - $basearch - Source
 #baseurl=http://download.fedoraproject.org/pub/epel/7/SRPMS
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-7&arch=$basearch
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-source-7&arch=$basearch
 failovermethod=priority
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
 gpgcheck=1
-mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-7&arch=$basearch
-
 
 # vim: filetype=dosini

diff --git a/yum.repos/ol7_addons.repo b/yum.repos/ol7_addons.repo
new file mode 100644 (file)
index 0000000..db55e9a
--- /dev/null
+++ b/yum.repos/ol7_addons.repo
@@ -0,0 +1,8 @@
+ddons]
+name=Oracle Linux $releasever Add ons ($basearch)
+baseurl=https://repo01.pixelpark.com/Linux/yum/OracleLinux/OL7/ol7_addons/
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
+
+# vim: filetype=dosini

diff --git a/yum.repos/ol7_latest.repo b/yum.repos/ol7_latest.repo
new file mode 100644 (file)
index 0000000..dcf8178
--- /dev/null
+++ b/yum.repos/ol7_latest.repo
@@ -0,0 +1,8 @@
+[ol7_latest]
+name=Oracle Linux $releasever Latest ($basearch)
+baseurl=https://repo01.pixelpark.com/Linux/yum/OracleLinux/OL7/ol7_latest/
+enabled=1
+gpgcheck=1
+gpgkey=https://repo01.pixelpark.com/Linux/yum/OracleLinux/OL7/RPM-GPG-KEY-oracle
+
+# vim: filetype=dosini

diff --git a/yum.repos/ol7_optional_latest.repo b/yum.repos/ol7_optional_latest.repo
new file mode 100644 (file)
index 0000000..a2802a5
--- /dev/null
+++ b/yum.repos/ol7_optional_latest.repo
@@ -0,0 +1,8 @@
+[ol7_optional_latest]
+name=Oracle Linux $releasever Optional Latest ($basearch)
+baseurl=https://repo01.pixelpark.com/Linux/yum/OracleLinux/OL7/ol7_optional_latest/
+enabled=1
+gpgcheck=1
+gpgkey=https://repo01.pixelpark.com/Linux/yum/OracleLinux/OL7/RPM-GPG-KEY-oracle
+
+# vim: filetype=dosini

diff --git a/yum.repos/pixelpark.repo b/yum.repos/pixelpark.repo
new file mode 100644 (file)
index 0000000..ae4dac7
--- /dev/null
+++ b/yum.repos/pixelpark.repo
@@ -0,0 +1,8 @@
+[pixelpark]
+name=pixelpark
+baseurl=https://repo01.pixelpark.com/Linux/yum/pixelpark/7
+enabled=1
+gpgcheck=1
+gpgkey=https://repo01.pixelpark.com/gpg/pixelpark.gpg
+
+# vim: filetype=dosini

diff --git a/yum.repos/public-yum-ol7.repo b/yum.repos/public-yum-ol7.repo
deleted file mode 100644 (file)
index 94b0846..0000000
--- a/yum.repos/public-yum-ol7.repo
+++ /dev/null
@@ -1,14 +0,0 @@
-[ol7_latest]
-name=Oracle Linux $releasever Latest ($basearch)
-baseurl=https://repo.pixelpark.com/Linux/yum/OracleLinux/OL7/latest/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
-gpgcheck=1
-enabled=1
-
-[ol7_u0_base]
-name=Oracle Linux $releasever GA installation media copy ($basearch)
-baseurl=https://repo.pixelpark.com/Linux/yum/OracleLinux/OL7/0/base/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
-gpgcheck=1
-enabled=0
-

diff --git a/yum.repos/puppet.repo b/yum.repos/puppet.repo
index 7ca355bee21bf2f49c807293aaa45a9797b15384..f50c81563bdcb0759740a2b39b397ef805507c4d 100644 (file)
--- a/yum.repos/puppet.repo
+++ b/yum.repos/puppet.repo
@@ -1,7 +1,7 @@
 [puppet]
 name=Puppet Repository el 7 - $basearch
-baseurl=https://repo.pixelpark.com/Linux/yum/puppetlabs/puppet5/el/7/$basearch
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppet-release
+baseurl=https://repo01.pixelpark.com/Linux/yum/puppetlabs/puppet5/el/7/$basearch
+gpgkey=https://repo01.pixelpark.com/Linux/yum/puppetlabs/RPM-GPG-KEY-puppetlabs
 enabled=1
 gpgcheck=1
 

diff --git a/yum.repos/rpm-repo.pixelpark.com.repo b/yum.repos/rpm-repo.pixelpark.com.repo
deleted file mode 100644 (file)
index 844d30f..0000000
--- a/yum.repos/rpm-repo.pixelpark.com.repo
+++ /dev/null
@@ -1,9 +0,0 @@
-[rpm-repo.pixelpark.com]
-name=Pixelpark Repo
-baseurl=http://rpm-repo.pixelpark.com/$basearch
-enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-pixelpark
-metadata_expire=10
-
-# vim: filetype=dosini