From 9803c8ed59044bca94effe6044b47d12052c2051 Mon Sep 17 00:00:00 2001
From: Ben Morrice <ben.morrice@cern.ch>
Date: Thu, 10 Feb 2022 14:48:10 +0100
Subject: [PATCH 1/6] add cephcopr to dev

---
 dev.repos.d/ceph_copr.repo    | 10 ++++++++++
 gpgkeys/RPM-GPG-KEY-ceph-copr | 18 ++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 dev.repos.d/ceph_copr.repo
 create mode 100644 gpgkeys/RPM-GPG-KEY-ceph-copr

diff --git a/dev.repos.d/ceph_copr.repo b/dev.repos.d/ceph_copr.repo
new file mode 100644
index 0000000..0242b51
--- /dev/null
+++ b/dev.repos.d/ceph_copr.repo
@@ -0,0 +1,10 @@
+[ceph_copr_el9]
+name=Copr repo for el9 owned by ceph
+baseurl=https://download.copr.fedorainfracloud.org/results/ceph/el9/centos-stream-9-$basearch/
+type=rpm-md
+skip_if_unavailable=True
+gpgcheck=1
+gpgkey=gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ceph-copr
+repo_gpgcheck=0
+enabled=1
+enabled_metadata=1
diff --git a/gpgkeys/RPM-GPG-KEY-ceph-copr b/gpgkeys/RPM-GPG-KEY-ceph-copr
new file mode 100644
index 0000000..a8f6ea4
--- /dev/null
+++ b/gpgkeys/RPM-GPG-KEY-ceph-copr
@@ -0,0 +1,18 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBGDuBXUBCADiBfJbAvPBL8jgrE02qi0if1Ywt8pt6sJVgDTw3qGOzng7UFCV
+gO4ScYVtshfetXLfbzVEGZj00XqvKdXshg/E5dt8cRb8T5i53z0fFG4DpZ7OzSia
+6Qqi+ZADEaIOPQBFanyZZTlFnmt2KCkeoU7KF3EKkfr49N0E6RrTLUYRwrKmeLBZ
+lj651Zk0NwbJ/tHgbULYVoXdOu2z5WlMDuE5FXSQKmv9tNn0+3V9FfGlNiB8p+MG
+yHdOZzNGpgN/NAupGGpPAyR3rJAHCyMpQ9AUjVCY5AK8sWW77ZhdDE8G9NfkMMjs
+HkLbm2YnvOENf+9EB+Pu+FJ/YgZr+AOV+j+bABEBAAG0MGNlcGhfZWw5IChOb25l
+KSA8Y2VwaCNlbDlAY29wci5mZWRvcmFob3N0ZWQub3JnPokBVAQTAQgAPhYhBExO
+PPpQD4jjn74Jqm1zT5ARoxbmBQJg7gV1AhsvBQkJZgGABQsJCAcCBhUKCQgLAgQW
+AgMBAh4BAheAAAoJEG1zT5ARoxbmiHgIAIBVjN/FbLQWQOa6qMQeWbx/Yz43wN/1
+86zgp6RKRrPu8LoBhB3Gf43YIIH5o5oQ8ivgyqeJ+JLdbUb8o5Xj3qggbgXgvCO9
+XXmnUmCpeZQ0SXPHayOb5OVy6Fk7IM6Fky8LQ6+uBL8oekLce8OvLS8M+980Tbdi
+QS3XuO6gi0POocgWR6MMzzVf8wFrGq8cf7WlJMsWf7oyj/wkCXLVs0V7XqL2n9gP
+/KNvJWDa6JmlK/PX7qMAUYnVK8qlQVk6nybgC+v6xru2eDcGGrrWkq2EKb908ao6
+TxVYi06dS17EDIw22Zmr7xt0QW8kzVZqQo8lTEh8Efle687uTprHOAE=
+=x7h/
+-----END PGP PUBLIC KEY BLOCK-----
-- 
GitLab


From bc42e336cee0a66b95c8598038ad69a659ea15f6 Mon Sep 17 00:00:00 2001
From: Ben Morrice <ben.morrice@cern.ch>
Date: Fri, 11 Feb 2022 12:45:25 +0100
Subject: [PATCH 2/6] fix typo

---
 dev.repos.d/ceph_copr.repo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev.repos.d/ceph_copr.repo b/dev.repos.d/ceph_copr.repo
index 0242b51..4c4edfa 100644
--- a/dev.repos.d/ceph_copr.repo
+++ b/dev.repos.d/ceph_copr.repo
@@ -4,7 +4,7 @@ baseurl=https://download.copr.fedorainfracloud.org/results/ceph/el9/centos-strea
 type=rpm-md
 skip_if_unavailable=True
 gpgcheck=1
-gpgkey=gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ceph-copr
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ceph-copr
 repo_gpgcheck=0
 enabled=1
 enabled_metadata=1
-- 
GitLab


From bad9549556c393fc0362e13709a96c45cc785a90 Mon Sep 17 00:00:00 2001
From: Ben Morrice <ben.morrice@cern.ch>
Date: Fri, 11 Feb 2022 12:53:24 +0100
Subject: [PATCH 3/6] fix baseurl

---
 dev.repos.d/ceph_copr.repo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev.repos.d/ceph_copr.repo b/dev.repos.d/ceph_copr.repo
index 4c4edfa..ce08814 100644
--- a/dev.repos.d/ceph_copr.repo
+++ b/dev.repos.d/ceph_copr.repo
@@ -1,6 +1,6 @@
 [ceph_copr_el9]
 name=Copr repo for el9 owned by ceph
-baseurl=https://download.copr.fedorainfracloud.org/results/ceph/el9/centos-stream-9-$basearch/
+baseurl=https://download.copr.fedorainfracloud.org/results/ceph/el9/centos-stream-9-x86_64/
 type=rpm-md
 skip_if_unavailable=True
 gpgcheck=1
-- 
GitLab


From 287a26c21cac64935e35821aa5465b18d5512e14 Mon Sep 17 00:00:00 2001
From: Ben Morrice <ben.morrice@cern.ch>
Date: Fri, 11 Feb 2022 12:58:38 +0100
Subject: [PATCH 4/6] move cephcopr to prod

---
 {dev.repos.d => prod.repos.d}/ceph_copr.repo | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {dev.repos.d => prod.repos.d}/ceph_copr.repo (100%)

diff --git a/dev.repos.d/ceph_copr.repo b/prod.repos.d/ceph_copr.repo
similarity index 100%
rename from dev.repos.d/ceph_copr.repo
rename to prod.repos.d/ceph_copr.repo
-- 
GitLab


From 3e7de4ed01fd8cb494005afa198f0578534e39e7 Mon Sep 17 00:00:00 2001
From: Ben Morrice <ben.morrice@cern.ch>
Date: Fri, 11 Feb 2022 13:01:29 +0100
Subject: [PATCH 5/6] rename ceph copr to use hyphens

---
 prod.repos.d/{ceph_copr.repo => ceph-copr.repo} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename prod.repos.d/{ceph_copr.repo => ceph-copr.repo} (92%)

diff --git a/prod.repos.d/ceph_copr.repo b/prod.repos.d/ceph-copr.repo
similarity index 92%
rename from prod.repos.d/ceph_copr.repo
rename to prod.repos.d/ceph-copr.repo
index ce08814..493fd55 100644
--- a/prod.repos.d/ceph_copr.repo
+++ b/prod.repos.d/ceph-copr.repo
@@ -1,4 +1,4 @@
-[ceph_copr_el9]
+[ceph-copr-el9-x86_64]
 name=Copr repo for el9 owned by ceph
 baseurl=https://download.copr.fedorainfracloud.org/results/ceph/el9/centos-stream-9-x86_64/
 type=rpm-md
-- 
GitLab


From d051e976bde4269aab46b143f6d43a2c78983cd6 Mon Sep 17 00:00:00 2001
From: Ben Morrice <ben.morrice@cern.ch>
Date: Fri, 11 Feb 2022 13:05:00 +0100
Subject: [PATCH 6/6] remove incorrect copr repo

---
 prod.repos.d/copr.repo | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 prod.repos.d/copr.repo

diff --git a/prod.repos.d/copr.repo b/prod.repos.d/copr.repo
deleted file mode 100644
index 391c2fc..0000000
--- a/prod.repos.d/copr.repo
+++ /dev/null
@@ -1,10 +0,0 @@
-[copr:copr.fedorainfracloud.org:ceph:el9]
-name=Copr repo for el9 owned by ceph
-baseurl=https://download.copr.fedorainfracloud.org/results/ceph/el9/centos-stream-9-$basearch/
-type=rpm-md
-skip_if_unavailable=True
-gpgcheck=1
-gpgkey=https://download.copr.fedorainfracloud.org/results/ceph/el9/pubkey.gpg
-repo_gpgcheck=0
-enabled=1
-enabled_metadata=1
-- 
GitLab