Update the HyperKitty repo

4 files changed, 72 insertions, 6 deletions

diff --git a/roles/mailman/files/hyperkitty.Fedora.repo b/roles/mailman/files/hyperkitty.Fedora.repo
index 1c711d060..39c339da3 100644
--- a/roles/mailman/files/hyperkitty.Fedora.repo
+++ b/roles/mailman/files/hyperkitty.Fedora.repo
@@ -1,6 +1,6 @@
 [hyperkitty]
 name=HyperKitty archiver and its dependencies
-baseurl=https://repos.fedorapeople.org/repos/abompard/hyperkitty/fedora-$releasever/$basearch/
+baseurl=https://repos.fedorapeople.org/repos/abompard/hyperkitty/stable/fedora-$releasever/$basearch/
 enabled=1
 skip_if_unavailable=1
 gpgcheck=1
@@ -8,7 +8,23 @@ gpgkey=https://repos.fedorapeople.org/repos/abompard/abompard.asc
 
 [hyperkitty-source]
 name=HyperKitty archiver and its dependencies - Source
-baseurl=https://repos.fedorapeople.org/repos/abompard/hyperkitty/fedora-$releasever/SRPMS
+baseurl=https://repos.fedorapeople.org/repos/abompard/hyperkitty/stable/fedora-$releasever/SRPMS
+enabled=0
+skip_if_unavailable=1
+gpgcheck=1
+gpgkey=https://repos.fedorapeople.org/repos/abompard/abompard.asc
+
+[hyperkitty-devel]
+name=HyperKitty archiver and its dependencies (devel versions)
+baseurl=https://repos.fedorapeople.org/repos/abompard/hyperkitty/devel/fedora-$releasever/$basearch/
+enabled=0
+skip_if_unavailable=1
+gpgcheck=1
+gpgkey=https://repos.fedorapeople.org/repos/abompard/abompard.asc
+
+[hyperkitty-devel-source]
+name=HyperKitty archiver and its dependencies (devel versions) - Source
+baseurl=https://repos.fedorapeople.org/repos/abompard/hyperkitty/devel/fedora-$releasever/SRPMS
 enabled=0
 skip_if_unavailable=1
 gpgcheck=1
diff --git a/roles/mailman/files/hyperkitty.RedHat.repo b/roles/mailman/files/hyperkitty.RedHat.repo
index 01c050a4e..0debff480 100644
--- a/roles/mailman/files/hyperkitty.RedHat.repo
+++ b/roles/mailman/files/hyperkitty.RedHat.repo
@@ -1,6 +1,6 @@
 [hyperkitty]
 name=HyperKitty archiver and its dependencies
-baseurl=https://repos.fedorapeople.org/repos/abompard/hyperkitty/el-$releasever/$basearch/
+baseurl=https://repos.fedorapeople.org/repos/abompard/hyperkitty/stable/el-$releasever/$basearch/
 enabled=1
 skip_if_unavailable=1
 gpgcheck=1
@@ -8,7 +8,23 @@ gpgkey=https://repos.fedorapeople.org/repos/abompard/abompard.asc
 
 [hyperkitty-source]
 name=HyperKitty archiver and its dependencies - Source
-baseurl=https://repos.fedorapeople.org/repos/abompard/hyperkitty/el-$releasever/SRPMS
+baseurl=https://repos.fedorapeople.org/repos/abompard/hyperkitty/stable/el-$releasever/SRPMS
+enabled=0
+skip_if_unavailable=1
+gpgcheck=1
+gpgkey=https://repos.fedorapeople.org/repos/abompard/abompard.asc
+
+[hyperkitty-devel]
+name=HyperKitty archiver and its dependencies (devel versions)
+baseurl=https://repos.fedorapeople.org/repos/abompard/hyperkitty/devel/el-$releasever/$basearch/
+enabled=0
+skip_if_unavailable=1
+gpgcheck=1
+gpgkey=https://repos.fedorapeople.org/repos/abompard/abompard.asc
+
+[hyperkitty-devel-source]
+name=HyperKitty archiver and its dependencies (devel versions) - Source
+baseurl=https://repos.fedorapeople.org/repos/abompard/hyperkitty/devel/el-$releasever/SRPMS
 enabled=0
 skip_if_unavailable=1
 gpgcheck=1
diff --git a/roles/mailman/files/hyperkitty.lists-dev.repo b/roles/mailman/files/hyperkitty.lists-dev.repo
new file mode 100644
index 000000000..3f175db33
--- /dev/null
+++ b/roles/mailman/files/hyperkitty.lists-dev.repo
@@ -0,0 +1,31 @@
+[hyperkitty]
+name=HyperKitty archiver and its dependencies
+baseurl=https://repos.fedorapeople.org/repos/abompard/hyperkitty/stable/el-$releasever/$basearch/
+enabled=1
+skip_if_unavailable=1
+gpgcheck=1
+gpgkey=https://repos.fedorapeople.org/repos/abompard/abompard.asc
+
+[hyperkitty-source]
+name=HyperKitty archiver and its dependencies - Source
+baseurl=https://repos.fedorapeople.org/repos/abompard/hyperkitty/stable/el-$releasever/SRPMS
+enabled=0
+skip_if_unavailable=1
+gpgcheck=1
+gpgkey=https://repos.fedorapeople.org/repos/abompard/abompard.asc
+
+[hyperkitty-devel]
+name=HyperKitty archiver and its dependencies (devel versions)
+baseurl=https://repos.fedorapeople.org/repos/abompard/hyperkitty/devel/el-$releasever/$basearch/
+enabled=1
+skip_if_unavailable=1
+gpgcheck=1
+gpgkey=https://repos.fedorapeople.org/repos/abompard/abompard.asc
+
+[hyperkitty-devel-source]
+name=HyperKitty archiver and its dependencies (devel versions) - Source
+baseurl=https://repos.fedorapeople.org/repos/abompard/hyperkitty/devel/el-$releasever/SRPMS
+enabled=0
+skip_if_unavailable=1
+gpgcheck=1
+gpgkey=https://repos.fedorapeople.org/repos/abompard/abompard.asc
diff --git a/roles/mailman/tasks/main.yml b/roles/mailman/tasks/main.yml
index cfe95cdf7..ce0dc546c 100644
--- a/roles/mailman/tasks/main.yml
+++ b/roles/mailman/tasks/main.yml
@@ -71,8 +71,11 @@
 # Packages
 #
 - name: setup the hyperkitty repo
-  copy: src=hyperkitty.{{ansible_distribution}}.repo
-        dest=/etc/yum.repos.d/hyperkitty.repo
+  copy: src={{item}} dest=/etc/yum.repos.d/hyperkitty.repo
+  with_first_found:
+  - hyperkitty.{{ansible_hostname}}.repo
+  - hyperkitty.{{ansible_distribution}}.repo
+  - hyperkitty.repo
   tags: mailman
 
 - name: install GPG to validate the key