From 4d1664a162a9034f6ebdcbca3d6c115884ca7d40 Mon Sep 17 00:00:00 2001
From: ionutboangiu <ionut.boangiu@itsyscom.com>
Date: Fri, 6 Jun 2025 20:00:45 +0300
Subject: [PATCH] update RabbitMQ repos and auto-detect distro

---
 .../ansible/roles/rabbitmq/defaults/main.yaml | 14 ++++++++-
 data/ansible/roles/rabbitmq/tasks/main.yaml   | 30 +++++++------------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/data/ansible/roles/rabbitmq/defaults/main.yaml b/data/ansible/roles/rabbitmq/defaults/main.yaml
index 43750693b..f7ab89d69 100644
--- a/data/ansible/roles/rabbitmq/defaults/main.yaml
+++ b/data/ansible/roles/rabbitmq/defaults/main.yaml
@@ -10,7 +10,19 @@ rabbitmq_dependencies:
   - gnupg
   - apt-transport-https
 
-erlang_dependencies:
+rabbitmq_repositories:
+  # Erlang repositories
+  - "deb [arch=amd64 signed-by=/usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg] https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-erlang/deb/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} main"
+  - "deb-src [signed-by=/usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg] https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-erlang/deb/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} main"
+  - "deb [arch=amd64 signed-by=/usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg] https://ppa2.rabbitmq.com/rabbitmq/rabbitmq-erlang/deb/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} main"
+  - "deb-src [signed-by=/usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg] https://ppa2.rabbitmq.com/rabbitmq/rabbitmq-erlang/deb/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} main"
+  # RabbitMQ repositories
+  - "deb [arch=amd64 signed-by=/usr/share/keyrings/rabbitmq.9F4587F226208342.gpg] https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} main"
+  - "deb-src [signed-by=/usr/share/keyrings/rabbitmq.9F4587F226208342.gpg] https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} main"
+  - "deb [arch=amd64 signed-by=/usr/share/keyrings/rabbitmq.9F4587F226208342.gpg] https://ppa2.rabbitmq.com/rabbitmq/rabbitmq-server/deb/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} main"
+  - "deb-src [signed-by=/usr/share/keyrings/rabbitmq.9F4587F226208342.gpg] https://ppa2.rabbitmq.com/rabbitmq/rabbitmq-server/deb/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} main"
+
+rabbitmq_erlang_dependencies:
   - erlang-base
   - erlang-asn1
   - erlang-crypto
diff --git a/data/ansible/roles/rabbitmq/tasks/main.yaml b/data/ansible/roles/rabbitmq/tasks/main.yaml
index 047fe19be..4fd749962 100644
--- a/data/ansible/roles/rabbitmq/tasks/main.yaml
+++ b/data/ansible/roles/rabbitmq/tasks/main.yaml
@@ -5,17 +5,10 @@
     name: "{{ rabbitmq_dependencies }}"
     state: present
 
-- name: Download RabbitMQ keys
+- name: Download and install RabbitMQ keys
   become: yes
-  ansible.builtin.get_url:
-    url: "{{ item.url }}"
-    dest: "{{ item.dest }}_armored"
-  loop: "{{ rabbitmq_keys }}"
-
-- name: De-Armor RabbitMQ keys
-  become: yes
-  shell: gpg --dearmor < {{ item.dest }}_armored > {{ item.dest }}
-  no_log: true
+  ansible.builtin.shell: |
+    curl -1sLf "{{ item.url }}" | gpg --dearmor | tee {{ item.dest }} > /dev/null
   args:
     creates: "{{ item.dest }}"
   loop: "{{ rabbitmq_keys }}"
@@ -25,21 +18,18 @@
   ansible.builtin.apt_repository:
     repo: "{{ item }}"
     state: present
+    update_cache: no
+  loop: "{{ rabbitmq_repositories }}"
+
+- name: Update package cache after adding repositories
+  become: yes
+  ansible.builtin.apt:
     update_cache: yes
-  loop:
-    - "deb [signed-by=/usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg] https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb/ubuntu jammy main"
-    - "deb-src [signed-by=/usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg] https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb/ubuntu jammy main"
-    - "deb [signed-by=/usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg] https://ppa2.novemberain.com/rabbitmq/rabbitmq-erlang/deb/ubuntu jammy main"
-    - "deb-src [signed-by=/usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg] https://ppa2.novemberain.com/rabbitmq/rabbitmq-erlang/deb/ubuntu jammy main"
-    - "deb [signed-by=/usr/share/keyrings/rabbitmq.9F4587F226208342.gpg] https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/ubuntu jammy main"
-    - "deb-src [signed-by=/usr/share/keyrings/rabbitmq.9F4587F226208342.gpg] https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/ubuntu jammy main"
-    - "deb [signed-by=/usr/share/keyrings/rabbitmq.9F4587F226208342.gpg] https://ppa2.novemberain.com/rabbitmq/rabbitmq-server/deb/ubuntu jammy main"
-    - "deb-src [signed-by=/usr/share/keyrings/rabbitmq.9F4587F226208342.gpg] https://ppa2.novemberain.com/rabbitmq/rabbitmq-server/deb/ubuntu jammy main"
 
 - name: Install Erlang packages
   become: yes
   ansible.builtin.apt:
-    name: "{{ erlang_dependencies }}"
+    name: "{{ rabbitmq_erlang_dependencies }}"
     state: present
 
 - name: Install RabbitMQ server